From: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Date: Fri, 23 Sep 2016 17:49:19 +0000 (-0700)
Subject: net/vxlan: Fix kernel unaligned access in __vxlan_find_mac
X-Git-Tag: v4.1.12-92~32^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=aaa3096c9d0002790d6d16c35c4638c5b030fd74;p=users%2Fjedix%2Flinux-maple.git

net/vxlan: Fix kernel unaligned access in __vxlan_find_mac

Orabug: 24593619

Backport of upstream commit 7177a3b037c7 ("net/vxlan: Fix kernel
unaligned access in __vxlan_find_mac")

__vxlan_find_mac invokes ether_addr_equal on the eth_addr field,
which triggers unaligned access messages, so rearrange vxlan_fdb
to avoid this in the most non-intrusive way.

Reviewed-by: Jiri Pirko <jiri@resnulli.us>
Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit aa51c7b55e350240c2ed5a8a217688d5bfd13424)
Signed-off-by: Allen Pais <allen.pais@oracle.com>
---

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 21a0fbf1ed947..b6a1530a5c0a1 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -106,9 +106,9 @@ struct vxlan_fdb {
 	unsigned long	  updated;	/* jiffies */
 	unsigned long	  used;
 	struct list_head  remotes;
+	u8		  eth_addr[ETH_ALEN];
 	u16		  state;	/* see ndm_state */
 	u8		  flags;	/* see ndm_flags */
-	u8		  eth_addr[ETH_ALEN];
 };
 
 /* Pseudo network device */