diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-01-17 14:47:18 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-20 17:44:02 -0500 |
commit | 9a8e47ffd95608f0768e1a8a0225c822aa53aa9b (patch) | |
tree | 2fb981c68f70d7d97cda5b444233b0a98e9c9360 | |
parent | ebad18e93fbc6bc63ee734edbc0eb38ac6b919c0 (diff) |
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/core/dev.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 6e44c3277101..5379b0c1190a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -2536,6 +2536,7 @@ struct sk_buff *napi_fraginfo_skb(struct napi_struct *napi, | |||
2536 | 2536 | ||
2537 | if (!pskb_may_pull(skb, ETH_HLEN)) { | 2537 | if (!pskb_may_pull(skb, ETH_HLEN)) { |
2538 | napi_reuse_skb(napi, skb); | 2538 | napi_reuse_skb(napi, skb); |
2539 | skb = NULL; | ||
2539 | goto out; | 2540 | goto out; |
2540 | } | 2541 | } |
2541 | 2542 | ||