]> git.hungrycats.org Git - linux/commitdiff
net: avoid skb_warn_bad_offload on IS_ERR
authorWillem de Bruijn <willemb@google.com>
Tue, 12 Dec 2017 16:39:04 +0000 (11:39 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 25 Feb 2018 10:01:18 +0000 (11:01 +0100)
commit 8d74e9f88d65af8bb2e095aff506aa6eac755ada upstream.

skb_warn_bad_offload warns when packets enter the GSO stack that
require skb_checksum_help or vice versa. Do not warn on arbitrary
bad packets. Packet sockets can craft many. Syzkaller was able to
demonstrate another one with eth_type games.

In particular, suppress the warning when segmentation returns an
error, which is for reasons other than checksum offload.

See also commit 36c92474498a ("net: WARN if skb_checksum_help() is
called on skb requiring segmentation") for context on this warning.

Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/core/dev.c

index 3d2dde9040af090269bc7ee28228e610b2c7a08c..a8564e793d0f7a86e995bc6ba3cda1424b4667cf 100644 (file)
@@ -2478,7 +2478,7 @@ struct sk_buff *__skb_gso_segment(struct sk_buff *skb,
 
        segs = skb_mac_gso_segment(skb, features);
 
-       if (unlikely(skb_needs_check(skb, tx_path)))
+       if (unlikely(skb_needs_check(skb, tx_path) && !IS_ERR(segs)))
                skb_warn_bad_offload(skb);
 
        return segs;