Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

netpoll: fix incorrect access to skb data in __netpoll_rx

Browse source 
__netpoll_rx() doesnt properly handle skbs with small header

pskb_may_pull() or pskb_trim_rcsum() can change skb->data, we must
reload it.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2011-08-26 06:26:15 +00:00 committed by David S. Miller
parent 3d015565f3
commit e9278a475f
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/core/netpoll.c
View file

@ -558,13 +558,14 @@ int __netpoll_rx(struct sk_buff *skb)
if (skb_shared(skb)) if (skb_shared(skb))
goto out; goto out;
iph = (struct iphdr *)skb->data;
if (!pskb_may_pull(skb, sizeof(struct iphdr))) if (!pskb_may_pull(skb, sizeof(struct iphdr)))
goto out; goto out;
iph = (struct iphdr *)skb->data;
if (iph->ihl < 5 || iph->version != 4) if (iph->ihl < 5 || iph->version != 4)
goto out; goto out;
if (!pskb_may_pull(skb, iph->ihl*4)) if (!pskb_may_pull(skb, iph->ihl*4))
goto out; goto out;
iph = (struct iphdr *)skb->data;
if (ip_fast_csum((u8 *)iph, iph->ihl) != 0) if (ip_fast_csum((u8 *)iph, iph->ihl) != 0)
goto out; goto out;
@ -579,6 +580,7 @@ int __netpoll_rx(struct sk_buff *skb)
if (pskb_trim_rcsum(skb, len)) if (pskb_trim_rcsum(skb, len))
goto out; goto out;
iph = (struct iphdr *)skb->data;
if (iph->protocol != IPPROTO_UDP) if (iph->protocol != IPPROTO_UDP)
goto out; goto out;