3 files changed, 24 insertions, 3 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 202c25a9aadf..a0ab6d9d400a 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2216,7 +2216,9 @@ static inline void skb_gro_incr_csum_unnecessary(struct sk_buff *skb)
         if (__skb_gro_checksum_validate_needed(skb, zero_okay, check))  \
                 __ret = __skb_gro_checksum_validate_complete(skb,       \
                                 compute_pseudo(skb, proto));            \
-        if (!__ret)                                                     \
+        if (__ret)                                                      \
+                __skb_mark_checksum_bad(skb);                           \
+        else                                                            \
                 skb_gro_incr_csum_unnecessary(skb);                     \
         __ret;                                                          \
 })
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index c93b5859a772..23710a243439 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -617,7 +617,8 @@ struct sk_buff {
 
         kmemcheck_bitfield_begin(flags3);
         __u8                    csum_level:2;
-        /* 14 bit hole */
+        __u8                    csum_bad:1;
+        /* 13 bit hole */
         kmemcheck_bitfield_end(flags3);
 
         __be16                  inner_protocol;
@@ -2825,6 +2826,21 @@ static inline void __skb_incr_checksum_unnecessary(struct sk_buff *skb)
         }
 }
 
+static inline void __skb_mark_checksum_bad(struct sk_buff *skb)
+{
+        /* Mark current checksum as bad (typically called from GRO
+         * path). In the case that ip_summed is CHECKSUM_NONE
+         * this must be the first checksum encountered in the packet.
+         * When ip_summed is CHECKSUM_UNNECESSARY, this is the first
+         * checksum after the last one validated. For UDP, a zero
+         * checksum can not be marked as bad.
+         */
+
+        if (skb->ip_summed == CHECKSUM_NONE ||
+            skb->ip_summed == CHECKSUM_UNNECESSARY)
+                skb->csum_bad = 1;
+}
+
 /* Check if we need to perform checksum complete validation.
  *
  * Returns true if checksum complete is needed, false otherwise
@@ -2866,6 +2882,9 @@ static inline __sum16 __skb_checksum_validate_complete(struct sk_buff *skb,
                         skb->csum_valid = 1;
                         return 0;
                 }
+        } else if (skb->csum_bad) {
+                /* ip_summed == CHECKSUM_NONE in this case */
+                return 1;
         }
 
         skb->csum = psum;
diff --git a/net/core/dev.c b/net/core/dev.c
index 6857d57aa294..3774afc3bebf 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3918,7 +3918,7 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff
         if (!(skb->dev->features & NETIF_F_GRO))
                 goto normal;
 
-        if (skb_is_gso(skb) || skb_has_frag_list(skb))
+        if (skb_is_gso(skb) || skb_has_frag_list(skb) || skb->csum_bad)
                 goto normal;
 
         gro_list_prepare(napi, skb);