leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ICMP]: Restore pskb_pull calls in receive function

Browse Source 
Somewhere along the development of my ICMP relookup patch the header
length check went AWOL on the non-IPsec path.  This patch restores the
check.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Herbert Xu 2008-02-05 03:15:50 -08:00 committed by David S. Miller
parent 5d8c0aa943
commit 8cf229437f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/ipv4/icmp.c
View File

@ -1015,7 +1015,8 @@ int icmp_rcv(struct sk_buff *skb)
goto error;
}
__skb_pull(skb, sizeof(*icmph));
if (!pskb_pull(skb, sizeof(*icmph)))
goto error;
icmph = icmp_hdr(skb);

3
net/ipv6/icmp.c
View File

@ -683,7 +683,8 @@ static int icmpv6_rcv(struct sk_buff *skb)
}
}
__skb_pull(skb, sizeof(*hdr));
if (!pskb_pull(skb, sizeof(*hdr)))
goto discard_it;
hdr = icmp6_hdr(skb);