Re: regression: tethering fails in 3.5 with iwlwifi
From: Johannes Berg <johannes@sipsolutions.net>
Date: 2012-09-20 12:47:13
Also in:
linux-wireless
Possibly related (same subject, not in this thread)
- 2013-03-23 · Re: regression: tethering fails in 3.5 with iwlwifi · Luis Henriques <hidden>
- 2013-03-22 · Re: regression: tethering fails in 3.5 with iwlwifi · Artem Bityutskiy <hidden>
- 2013-03-21 · Re: regression: tethering fails in 3.5 with iwlwifi · David Miller <davem@davemloft.net>
- 2013-03-21 · Re: regression: tethering fails in 3.5 with iwlwifi · Johannes Berg <johannes@sipsolutions.net>
- 2012-09-21 · Re: regression: tethering fails in 3.5 with iwlwifi · David Miller <hidden>
On Thu, 2012-09-20 at 14:45 +0200, Eric Dumazet wrote:
quoted hunk ↗ jump to hunk
I guess you only need to make sure 14 bytes of ethernet header are available before eth_type_trans(skb, dev);diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 61c621e..ffe5f84 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c@@ -1795,9 +1795,13 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx) if (skb) { /* deliver to local stack */ - skb->protocol = eth_type_trans(skb, dev); - memset(skb->cb, 0, sizeof(skb->cb)); - netif_receive_skb(skb); + if (pskb_may_pull(skb, sizeof(struct ethhdr))) { + skb->protocol = eth_type_trans(skb, dev); + memset(skb->cb, 0, sizeof(skb->cb)); + netif_receive_skb(skb); + } else { + kfree_skb(skb); + } } }
Yeah I was looking at the same code just now. However, we had actually inserted the skb_linearize() *after* eth_type_trans(), so I'm confused. Maybe it still works, more or less by accident? johannes