diff --git a/net/core/dev.c b/net/core/dev.c
index a381e87fb380..9845dcf0a3de 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3140,6 +3140,11 @@ static netdev_features_t gso_features_check(const struct sk_buff *skb,
 	if (gso_segs > dev->gso_max_segs)
 		return features & ~NETIF_F_GSO_MASK;
 
+	if (!skb_shinfo(skb)->gso_type) {
+		skb_warn_bad_offload(skb);
+		return features & ~NETIF_F_GSO_MASK;
+	}
+
 	/* Support for GSO partial features requires software
 	 * intervention before we can actually process the packets
 	 * so we need to strip support for any partial features now