mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
47 lines
2.0 KiB
Diff
47 lines
2.0 KiB
Diff
From c8bcd82a4efd053cdd5ce515a8b0003011a5f756 Mon Sep 17 00:00:00 2001
|
|
From: Kees Cook <keescook@chromium.org>
|
|
Date: Wed, 16 Jun 2021 12:54:10 -0700
|
|
Subject: [PATCH] ath11k: Avoid memcpy() over-reading of he_cap
|
|
|
|
In preparation for FORTIFY_SOURCE performing compile-time and run-time
|
|
field bounds checking for memcpy(), memmove(), and memset(), avoid
|
|
intentionally writing across neighboring array fields.
|
|
|
|
Since peer_he_cap_{mac,phy}info and he_cap_elem.{mac,phy}_cap_info are not
|
|
the same sizes, memcpy() was reading beyond field boundaries. Instead,
|
|
correctly cap the copy length and pad out any difference in size
|
|
(peer_he_cap_macinfo is 8 bytes whereas mac_cap_info is 6, and
|
|
peer_he_cap_phyinfo is 12 bytes whereas phy_cap_info is 11).
|
|
|
|
Signed-off-by: Kees Cook <keescook@chromium.org>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
Link: https://lore.kernel.org/r/20210616195410.1232119-1-keescook@chromium.org
|
|
---
|
|
drivers/net/wireless/ath/ath11k/mac.c | 14 ++++++++++----
|
|
1 file changed, 10 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
|
|
index eb52332dbe3f13..e9b3689331ec2a 100644
|
|
--- a/drivers/net/wireless/ath/ath11k/mac.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/mac.c
|
|
@@ -1314,10 +1314,16 @@ static void ath11k_peer_assoc_h_he(struct ath11k *ar,
|
|
|
|
arg->he_flag = true;
|
|
|
|
- memcpy(&arg->peer_he_cap_macinfo, he_cap->he_cap_elem.mac_cap_info,
|
|
- sizeof(arg->peer_he_cap_macinfo));
|
|
- memcpy(&arg->peer_he_cap_phyinfo, he_cap->he_cap_elem.phy_cap_info,
|
|
- sizeof(arg->peer_he_cap_phyinfo));
|
|
+ memcpy_and_pad(&arg->peer_he_cap_macinfo,
|
|
+ sizeof(arg->peer_he_cap_macinfo),
|
|
+ he_cap->he_cap_elem.mac_cap_info,
|
|
+ sizeof(he_cap->he_cap_elem.mac_cap_info),
|
|
+ 0);
|
|
+ memcpy_and_pad(&arg->peer_he_cap_phyinfo,
|
|
+ sizeof(arg->peer_he_cap_phyinfo),
|
|
+ he_cap->he_cap_elem.phy_cap_info,
|
|
+ sizeof(he_cap->he_cap_elem.phy_cap_info),
|
|
+ 0);
|
|
arg->peer_he_ops = vif->bss_conf.he_oper.params;
|
|
|
|
/* the top most byte is used to indicate BSS color info */
|