diff options
| author | Alexander Drozdov <al.drozdov@gmail.com> | 2015-02-17 13:33:46 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-05-09 23:16:19 +0100 |
| commit | aafdaa379ae3fb58acefa092b8edc3a64c929bb9 (patch) | |
| tree | 35089fa970c830419ea1d7c857d4414c7c070c49 /net | |
| parent | ffd8b8a4fa7e264cd458096ebbb80c398721a67a (diff) | |
ipv4: ip_check_defrag should correctly check return value of skb_copy_bits
commit fba04a9e0c869498889b6445fd06cbe7da9bb834 upstream.
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: 1bf3751ec90c ("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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ip_fragment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 8f441b241372..fbe920f5cc00 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c @@ -697,7 +697,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) |