From: Alexander Duyck Date: Tue, 9 Feb 2016 14:14:43 +0000 (-0800) Subject: net: Copy inner L3 and L4 headers as unaligned on GRE TEB X-Git-Tag: firefly_0821_release~176^2~475^2~393 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e3865b8bb55897cef3ebb23da090a2b756ddf9d6;p=firefly-linux-kernel-4.4.55.git net: Copy inner L3 and L4 headers as unaligned on GRE TEB [ Upstream commit 78565208d73ca9b654fb9a6b142214d52eeedfd1 ] 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 Acked-by: Tom Herbert Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index d79699c9d1b9..b258f457dac8 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -396,6 +396,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;