diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2014-10-08 12:44:55 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-10-08 15:24:16 -0400 |
| commit | 1fca350b761631d182c2e8bce530896e66404bc2 (patch) | |
| tree | 22e0bade399ab65eb5027f7c00bb60213a5847e3 /drivers/net | |
| parent | ca14405e3b25b38221d027d8970c1d74ed0b6532 (diff) | |
| download | talos-obmc-linux-1fca350b761631d182c2e8bce530896e66404bc2.tar.gz talos-obmc-linux-1fca350b761631d182c2e8bce530896e66404bc2.zip | |
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: Larry Finger <Larry.Finger@lwfinger.net>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/wifi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h index 976667ae8549..6866dcf24340 100644 --- a/drivers/net/wireless/rtlwifi/wifi.h +++ b/drivers/net/wireless/rtlwifi/wifi.h @@ -1370,7 +1370,7 @@ struct rtl_mac { bool rdg_en; /*AP*/ - u8 bssid[6]; + u8 bssid[ETH_ALEN] __aligned(2); u32 vendor; u8 mcs[16]; /* 16 bytes mcs for HT rates. */ u32 basic_rates; /* b/g rates */ |
