| Message ID | 20090118054718.GA24943@gondor.apana.org.au |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Herbert Xu <herbert@gondor.apana.org.au> Date: Sun, 18 Jan 2009 16:47:18 +1100 > gro: Fix error handling on extremely short frags > > 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> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/core/dev.c b/net/core/dev.c index 4f69a2d..2fb3a00 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2514,6 +2514,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; }
The second is a trivial error handling bug. gro: Fix error handling on extremely short frags 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> Cheers,