diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-04-27 05:44:29 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-27 05:44:29 -0700 |
| commit | edbd9e30306067c3a45c035eb95a6f49daaa2337 (patch) | |
| tree | 00e8ce4bbb0b517cea71ff14165b2b1d944d22f3 /net/core | |
| parent | 56ed4351c2604c221a82276f51e5dfd467921bf3 (diff) | |
| download | op-kernel-dev-edbd9e30306067c3a45c035eb95a6f49daaa2337.zip op-kernel-dev-edbd9e30306067c3a45c035eb95a6f49daaa2337.tar.gz | |
gro: Fix handling of headers that extend over the tail
The skb_gro_* code fails to handle the case where a header starts
in the linear area but ends in the frags area. Since the goal
of skb_gro_* is to optimise the case of completely non-linear
packets, we can simply bail out if we have anything in the linear
area.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index e48c08a..6785b06 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2378,18 +2378,13 @@ void *skb_gro_header(struct sk_buff *skb, unsigned int hlen) unsigned int offset = skb_gro_offset(skb); hlen += offset; - if (hlen <= skb_headlen(skb)) - return skb->data + offset; - - if (unlikely(!skb_shinfo(skb)->nr_frags || - skb_shinfo(skb)->frags[0].size <= - hlen - skb_headlen(skb) || + if (unlikely(skb_headlen(skb) || + skb_shinfo(skb)->frags[0].size < hlen || PageHighMem(skb_shinfo(skb)->frags[0].page))) return pskb_may_pull(skb, hlen) ? skb->data + offset : NULL; return page_address(skb_shinfo(skb)->frags[0].page) + - skb_shinfo(skb)->frags[0].page_offset + - offset - skb_headlen(skb); + skb_shinfo(skb)->frags[0].page_offset + offset; } EXPORT_SYMBOL(skb_gro_header); |
