ath12k: fix memcpy array overflow in ath12k_peer_assoc_h_he
PATCH 1/1 ath12k: fix memcpy array overflow in ath12k_peer_assoc_h_he
From: Arnd Bergmann <[email protected]>
Two memory copies in this function copy from a short array into a longer one, using the wrong size, which leads to an out-of-bounds access:
include/linux/fortify-string.h:592:4: error: call to '__read_overflow2_field' declared with 'warning' attribute: detected read beyond size of field (2nd parameter); maybe use struct_group()? [-Werror,-Wattribute-warning]
__read_overflow2_field(q_size_field, size);
^include/linux/fortify-string.h:592:4: error: call to '__read_overflow2_field' declared with 'warning' attribute: detected read beyond size of field (2nd parameter); maybe use struct_group()? [-Werror,-Wattribute-warning] 2 errors generated.
--- drivers/net/wireless/ath/ath12k/mac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath12k/mac.c +2 -2
@@ -1637,9 +1637,9 @@ static void ath12k_peer_assoc_h_he(struct ath12k *ar, arg->peer_nss =min (sta->deflink.rx_nss, max_nss);memcpy (&arg->peer_he_cap_macinfo, he_cap->he_cap_elem.mac_cap_info, -sizeof (arg->peer_he_cap_macinfo)); +sizeof (he_cap->he_cap_elem.mac_cap_info));memcpy (&arg->peer_he_cap_phyinfo, he_cap->he_cap_elem.phy_cap_info, -sizeof (arg->peer_he_cap_phyinfo)); +sizeof (he_cap->he_cap_elem.phy_cap_info)); arg->peer_he_ops = vif->bss_conf.he_oper.params;/* the top most byte is used to indicate BSS color info */
Signature · 7 lines
2.39.2 -- ath12k mailing list [email protected] https://lists.infradead.org/mailman/listinfo/ath12k
Quoted 4 lines · Arnd Bergmann
Two memory copies in this function copy from a short array into a longer one, using the wrong size, which leads to an out-of-bounds access:
include/linux/fortify-string.h:592:4: error: call to '__read_overflow2_field' declared with 'warning' attribute: detected read beyond size of field (2nd parameter); maybe usestruct_group()? [-Werror,-Wattribute-warning]
Quoted 8 lines
__read_overflow2_field(q_size_field, size); ^
include/linux/fortify-string.h:592:4: error: call to '__read_overflow2_field' declared with 'warning' attribute: detected read beyond size of field (2nd parameter); maybe usestruct_group()? [-Werror,-Wattribute-warning] 2 errors generated.Fixes d889913205cf7 ("wifi: ath12k: driver for Qualcomm Wi-Fi 7 devices")Signed-off-by Arnd Bergmann <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
603cf6c2fcdc wifi: ath12k: fix memcpy array overflow in ath12k_peer_assoc_h_he()
Signature · 9 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches -- ath12k mailing list [email protected] https://lists.infradead.org/mailman/listinfo/ath12k