From 4c0543742e0e5d6a8e6e33da797dee65b8ffe3c9 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Sat, 22 Sep 2012 00:08:29 +0000 Subject: [PATCH] --- yaml --- r: 323158 b: refs/heads/master c: ab43ed8b7490cb387782423ecf74aeee7237e591 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/raw.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b12018d03418..33b4d7d18203 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9913b8c8f05b0aad97432900fa3b2cdfd557eeb5 +refs/heads/master: ab43ed8b7490cb387782423ecf74aeee7237e591 diff --git a/trunk/net/ipv4/raw.c b/trunk/net/ipv4/raw.c index ff0f071969ea..d23c6571ba1c 100644 --- a/trunk/net/ipv4/raw.c +++ b/trunk/net/ipv4/raw.c @@ -131,18 +131,20 @@ static struct sock *__raw_v4_lookup(struct net *net, struct sock *sk, * 0 - deliver * 1 - block */ -static __inline__ int icmp_filter(struct sock *sk, struct sk_buff *skb) +static int icmp_filter(const struct sock *sk, const struct sk_buff *skb) { - int type; + struct icmphdr _hdr; + const struct icmphdr *hdr; - if (!pskb_may_pull(skb, sizeof(struct icmphdr))) + hdr = skb_header_pointer(skb, skb_transport_offset(skb), + sizeof(_hdr), &_hdr); + if (!hdr) return 1; - type = icmp_hdr(skb)->type; - if (type < 32) { + if (hdr->type < 32) { __u32 data = raw_sk(sk)->filter.data; - return ((1 << type) & data) != 0; + return ((1U << hdr->type) & data) != 0; } /* Do not block unknown ICMP types */