summaryrefslogtreecommitdiffstats
path: root/net/hsr
diff options
context:
space:
mode:
authorAndreas Oetken <andreas.oetken@siemens.com>2021-02-02 10:03:04 +0100
committerJakub Kicinski <kuba@kernel.org>2021-02-02 08:57:18 -0800
commit6c9f18f294c4a1a6d8b1097e39c325481664ee1c (patch)
tree79be938ea4d30e6961d9c0f8bacbcaec02ed1cce /net/hsr
parent5a4cb546753ddf8f8182b441755c53f3111c5804 (diff)
downloadlinux-stable-6c9f18f294c4a1a6d8b1097e39c325481664ee1c.tar.gz
linux-stable-6c9f18f294c4a1a6d8b1097e39c325481664ee1c.tar.bz2
linux-stable-6c9f18f294c4a1a6d8b1097e39c325481664ee1c.zip
net: hsr: align sup_multicast_addr in struct hsr_priv to u16 boundary
sup_multicast_addr is passed to ether_addr_equal for address comparison which casts the address inputs to u16 leading to an unaligned access. Aligning the sup_multicast_addr to u16 boundary fixes the issue. Signed-off-by: Andreas Oetken <andreas.oetken@siemens.com> Link: https://lore.kernel.org/r/20210202090304.2740471-1-ennoerlangen@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/hsr')
-rw-r--r--net/hsr/hsr_main.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/hsr/hsr_main.h b/net/hsr/hsr_main.h
index 7dc92ce5a134..a9c30a608e35 100644
--- a/net/hsr/hsr_main.h
+++ b/net/hsr/hsr_main.h
@@ -217,7 +217,10 @@ struct hsr_priv {
u8 net_id; /* for PRP, it occupies most significant 3 bits
* of lan_id
*/
- unsigned char sup_multicast_addr[ETH_ALEN];
+ unsigned char sup_multicast_addr[ETH_ALEN] __aligned(sizeof(u16));
+ /* Align to u16 boundary to avoid unaligned access
+ * in ether_addr_equal
+ */
#ifdef CONFIG_DEBUG_FS
struct dentry *node_tbl_root;
#endif