diff options
| author | Alexander Duyck <aduyck@mirantis.com> | 2016-02-09 15:14:43 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-16 21:25:01 +0100 |
| commit | 78565208d73ca9b654fb9a6b142214d52eeedfd1 (patch) | |
| tree | 1d7052b654fea42b5f494aeb28626af457a2e9fb /net | |
| parent | Merge branch 'mlx5-fixes' (diff) | |
| download | linux-78565208d73ca9b654fb9a6b142214d52eeedfd1.tar.xz linux-78565208d73ca9b654fb9a6b142214d52eeedfd1.zip | |
net: Copy inner L3 and L4 headers as unaligned on GRE TEB
This patch corrects the unaligned accesses seen on GRE TEB tunnels when
generating hash keys. Specifically what this patch does is make it so that
we force the use of skb_copy_bits when the GRE inner headers will be
unaligned due to NET_IP_ALIGNED being a non-zero value.
Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Acked-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/flow_dissector.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index eab81bc80e5c..12e700332010 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -399,6 +399,13 @@ ip_proto_again: goto out_bad; proto = eth->h_proto; nhoff += sizeof(*eth); + + /* Cap headers that we access via pointers at the + * end of the Ethernet header as our maximum alignment + * at that point is only 2 bytes. + */ + if (NET_IP_ALIGN) + hlen = nhoff; } key_control->flags |= FLOW_DIS_ENCAPSULATION; |