diff options
| author |   Eric Dumazet <edumazet@google.com> | 2012-09-25 08:21:16 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-09-25 03:11:13 -0400 |
| commit | 8489c1d9a80e6263fb71de5bc7f39773712cfa7e (patch) | |
| tree | e580f2a356bcd6a0b5a64a7ab1e98e1fd7e7b39b /net/ipv4 | |
| parent | x86: bpf_jit_comp: add XOR instruction for BPF JIT (diff) | |
| download | linux-dev-8489c1d9a80e6263fb71de5bc7f39773712cfa7e.tar.xz linux-dev-8489c1d9a80e6263fb71de5bc7f39773712cfa7e.zip | |
net: raw: revert unrelated change
Commit 5640f7685831 ("net: use a per task frag allocator")
accidentally contained an unrelated change to net/ipv4/raw.c,
later committed (without the pr_err() debugging bits) in
net tree as commit ab43ed8b749 (ipv4: raw: fix icmp_filter())
This patch reverts this glitch, noticed by Stephen Rothwell.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/raw.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index a80740ba4248..f2425785d40a 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -131,23 +131,18 @@ found: * 0 - deliver * 1 - block */ -static int icmp_filter(const struct sock *sk, const struct sk_buff *skb) +static __inline__ int icmp_filter(struct sock *sk, struct sk_buff *skb) { - struct icmphdr _hdr; - const struct icmphdr *hdr; - - pr_err("icmp_filter skb_transport_offset %d data-head %ld len %d/%d\n", - skb_transport_offset(skb), skb->data - skb->head, skb->len, skb->data_len); - hdr = skb_header_pointer(skb, skb_transport_offset(skb), - sizeof(_hdr), &_hdr); - pr_err("head %p data %p hdr %p type %d\n", skb->head, skb->data, hdr, hdr ? hdr->type : -1); - if (!hdr) + int type; + + if (!pskb_may_pull(skb, sizeof(struct icmphdr))) return 1; - if (hdr->type < 32) { + type = icmp_hdr(skb)->type; + if (type < 32) { __u32 data = raw_sk(sk)->filter.data; - return ((1U << hdr->type) & data) != 0; + return ((1 << type) & data) != 0; } /* Do not block unknown ICMP types */ |