Commit 1fca350b authored by Larry Finger's avatar Larry Finger Committed by John W. Linville

rtlwifi: Fix possible unaligned array in ether_addr_copy()

Two macros used to copy BSSID information use ether_addr_copy(), thus
the arrays must be 2-byte aligned. In one case, the array could become
unaligned if the struct containing it were changed. Use the __unaligned(2)
attribute to retain the necessary alignment. In addition, the magic number
used to specify the size of the array is replaced by ETH_ALEN.
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ca14405e
...@@ -1370,7 +1370,7 @@ struct rtl_mac { ...@@ -1370,7 +1370,7 @@ struct rtl_mac {
bool rdg_en; bool rdg_en;
/*AP*/ /*AP*/
u8 bssid[6]; u8 bssid[ETH_ALEN] __aligned(2);
u32 vendor; u32 vendor;
u8 mcs[16]; /* 16 bytes mcs for HT rates. */ u8 mcs[16]; /* 16 bytes mcs for HT rates. */
u32 basic_rates; /* b/g rates */ u32 basic_rates; /* b/g rates */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment