Re: regression: tethering fails in 3.5 with iwlwifi
From: Eric Dumazet <hidden>
Date: 2012-09-20 14:25:54
Also in:
linux-wireless
Subsystem:
networking [general], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
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-20 · Re: regression: tethering fails in 3.5 with iwlwifi · Eric Dumazet <hidden>
On Thu, 2012-09-20 at 16:22 +0300, Artem Bityutskiy wrote:
quoted hunk ↗ jump to hunk
On Thu, 2012-09-20 at 15:04 +0200, Eric Dumazet wrote:quoted
Try to pull 40 bytes : Thats OK for tcp performance, because 40 bytes is the minimum size of IP+TCP headers pskb_may_pull(skb, 40);OK, I've tried almost this (see below) and it solves my issue:diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 965e6ec..7f079d0 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c@@ -1798,9 +1798,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, 40)) { + skb->protocol = eth_type_trans(skb, dev); + memset(skb->cb, 0, sizeof(skb->cb)); + netif_receive_skb(skb); + } else { + kfree_skb(skb); + } } }
Please remove this hack and try the following bugfix in raw handler icmp_filter() should not modify skb, or else its caller should not assume ip_hdr() is unchanged. net/ipv4/raw.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index f242578..3fa8c96 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c@@ -128,25 +128,30 @@ found: } /* - * 0 - deliver - * 1 - block + * false - deliver + * true - block */ -static __inline__ int icmp_filter(struct sock *sk, struct sk_buff *skb) +static bool icmp_filter(struct sock *sk, const struct sk_buff *skb) { - int type; - - if (!pskb_may_pull(skb, sizeof(struct icmphdr))) - return 1; - - type = icmp_hdr(skb)->type; - if (type < 32) { + __u8 _type; + const __u8 *type; + + type = skb_header_pointer(skb, + skb_transport_offset(skb) + + offsetof(struct icmphdr, type), + sizeof(_type), + &_type); + if (!type) + return true; + + if (*type < 32) { __u32 data = raw_sk(sk)->filter.data; - return ((1 << type) & data) != 0; + return ((1U << *type) & data) != 0; } /* Do not block unknown ICMP types */ - return 0; + return false; } /* IP input processing comes here for RAW socket delivery.