]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
gro: Fix error handling on extremely short frags
authorHerbert Xu <herbert@gondor.apana.org.au>
Sat, 17 Jan 2009 19:47:18 +0000 (19:47 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 20 Jan 2009 22:44:02 +0000 (14:44 -0800)
When a frag is shorter than an Ethernet header, we'd return a
zeroed packet instead of aborting.  This patch fixes that.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/dev.c

index 6e44c3277101b301cba179619e1f24001bd2133a..5379b0c1190a86aa10ab8afd0ae4da9597af1611 100644 (file)
@@ -2536,6 +2536,7 @@ struct sk_buff *napi_fraginfo_skb(struct napi_struct *napi,
 
        if (!pskb_may_pull(skb, ETH_HLEN)) {
                napi_reuse_skb(napi, skb);
+               skb = NULL;
                goto out;
        }