diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-11-29 23:07:58 +1100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-12-14 09:51:04 -0800 |
| commit | 593b85eff26bc1c33c54be8632ac181b6cc1b5a4 (patch) | |
| tree | dac1cb3334c72a401a732706a1829b21560b273c | |
| parent | df70b187c9908155ba646b57797c2c6e7b426733 (diff) | |
TCP: Fix TCP header misalignment
[TCP]: Fix TCP header misalignment
[ Upstream commit: 21df56c6e2372e09c916111efb6c14c372a5ab2e ]
Indeed my previous change to alloc_pskb has made it possible
for the TCP header to be misaligned iff the MTU is not a multiple
of 4 (and less than a page). So I suspect the optimised IPsec
MTU calculation is giving you just such an MTU :)
This patch fixes it by changing alloc_pskb to make sure that
the size is at least 32-bit aligned. This does not cause the
problem fixed by the previous patch because max_header is always
32-bit aligned which means that in the SG/NOTSO case this will
be a no-op.
I thought about putting this in the callers but all the current
callers are from TCP. If and when we get a non-TCP caller we
can always create a TCP wrapper for this function and move the
alignment over there.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | include/net/sock.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index bdd9ebe63392..8a71ab362612 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1200,6 +1200,9 @@ static inline struct sk_buff *sk_stream_alloc_pskb(struct sock *sk, { struct sk_buff *skb; + /* The TCP header must be at least 32-bit aligned. */ + size = ALIGN(size, 4); + skb = alloc_skb_fclone(size + sk->sk_prot->max_header, gfp); if (skb) { skb->truesize += mem; |