From 826dbd59168d9cfa9cf1c232cc917a0431df9bbe Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Tue, 9 Feb 2016 06:14:43 -0800 Subject: [PATCH] net: Copy inner L3 and L4 headers as unaligned on GRE TEB Orabug: 23330951 [ 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: Sasha Levin (cherry picked from commit f68887de614bcf857651c0d2e24cfc3004dc20e4) Signed-off-by: Dan Duval --- net/core/flow_dissector.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index f96d2caa748c..3556791fdc6e 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -233,6 +233,13 @@ ipv6: return false; 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; } goto again; } -- 2.50.1