From: Alexander Duyck <aduyck@mirantis.com>
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: v4.1.12-92~150^2~173
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=826dbd59168d9cfa9cf1c232cc917a0431df9bbe;p=users%2Fjedix%2Flinux-maple.git

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 <aduyck@mirantis.com>
Acked-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit f68887de614bcf857651c0d2e24cfc3004dc20e4)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index f96d2caa748c9..3556791fdc6eb 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;
 		}