Commit 913c52e4 authored Feb 17, 2015 by Alexander Drozdov Committed by Sasha Levin Mar 14, 2015

ipv4: ip_check_defrag should correctly check return value of skb_copy_bits



[ Upstream commit fba04a9e0c869498889b6445fd06cbe7da9bb834 ]

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: 1bf3751e ("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: Sasha Levin <sasha.levin@oracle.com>

parent aaf410be

net/ipv4/ip_fragment.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -665,7 +665,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)