OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ipv4: ip_check_defrag should correctly check return value of skb_copy_bits

Browse Source 
[ Upstream commit fba04a9e0c ]

skb_copy_bits() returns zero on success and negative value on error,
so it is needed to invert the condition in ip_check_defrag().

Fixes: 1bf3751ec9 ("ipv4: ip_check_defrag must not modify skb before unsharing")
Signed-off-by: Alexander Drozdov <al.drozdov@gmail.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexander Drozdov 2015-02-17 13:33:46 +03:00 committed by Greg Kroah-Hartman
parent f1796b116e
commit 0b04f65d11
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/ip_fragment.c
View File

@ -684,7 +684,7 @@ struct sk_buff *ip_check_defrag(struct sk_buff *skb, u32 user)
if (skb->protocol != htons(ETH_P_IP))
return skb;
if (!skb_copy_bits(skb, 0, &iph, sizeof(iph)))
if (skb_copy_bits(skb, 0, &iph, sizeof(iph)) < 0)
return skb;
if (iph.ihl < 5 || iph.version != 4)