p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Alexander Duyck 2016-02-09 06:14:43 -08:00 committed by David S. Miller
parent 7b4c534ed4
commit 78565208d7
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/core/flow_dissector.c
View File

@ -399,6 +399,13 @@ bool __skb_flow_dissect(const struct sk_buff *skb,
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;