linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] mwl8k: Avoid memcpy() over-reading of mcs.rx_mask
@ 2021-06-17  4:14 Kees Cook
  2021-06-22 15:24 ` Kalle Valo
  0 siblings, 1 reply; 2+ messages in thread
From: Kees Cook @ 2021-06-17  4:14 UTC (permalink / raw)
  To: Andrew Lunn
  Cc: Kees Cook, Lennert Buytenhek, Kalle Valo, David S. Miller,
	Jakub Kicinski, Romain Perier, Allen Pais, Gustavo A. R. Silva,
	Arnd Bergmann, wengjianfeng, Christophe JAILLET, Lv Yunlong,
	linux-kernel, linux-wireless, netdev, linux-hardening

In preparation for FORTIFY_SOURCE performing compile-time and run-time
field bounds checking for memcpy(), memmove(), and memset(), avoid
intentionally reading across neighboring array fields. Use the
sub-structure address directly.

Signed-off-by: Kees Cook <keescook@chromium.org>
---
v2: fix Subject for actual issue
v1: https://lore.kernel.org/lkml/20210616195242.1231287-1-keescook@chromium.org
---
 drivers/net/wireless/marvell/mwl8k.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/marvell/mwl8k.c b/drivers/net/wireless/marvell/mwl8k.c
index 84b32a5f01ee..3bf6571f4149 100644
--- a/drivers/net/wireless/marvell/mwl8k.c
+++ b/drivers/net/wireless/marvell/mwl8k.c
@@ -4552,7 +4552,7 @@ static int mwl8k_cmd_update_stadb_add(struct ieee80211_hw *hw,
 	else
 		rates = sta->supp_rates[NL80211_BAND_5GHZ] << 5;
 	legacy_rate_mask_to_array(p->legacy_rates, rates);
-	memcpy(p->ht_rates, sta->ht_cap.mcs.rx_mask, 16);
+	memcpy(p->ht_rates, &sta->ht_cap.mcs, 16);
 	p->interop = 1;
 	p->amsdu_enabled = 0;
 
@@ -5034,7 +5034,7 @@ mwl8k_bss_info_changed_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 			ap_legacy_rates =
 				ap->supp_rates[NL80211_BAND_5GHZ] << 5;
 		}
-		memcpy(ap_mcs_rates, ap->ht_cap.mcs.rx_mask, 16);
+		memcpy(ap_mcs_rates, &ap->ht_cap.mcs, 16);
 
 		rcu_read_unlock();
 
-- 
2.25.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] mwl8k: Avoid memcpy() over-reading of mcs.rx_mask
  2021-06-17  4:14 [PATCH v2] mwl8k: Avoid memcpy() over-reading of mcs.rx_mask Kees Cook
@ 2021-06-22 15:24 ` Kalle Valo
  0 siblings, 0 replies; 2+ messages in thread
From: Kalle Valo @ 2021-06-22 15:24 UTC (permalink / raw)
  To: Kees Cook
  Cc: Andrew Lunn, Kees Cook, Lennert Buytenhek, David S. Miller,
	Jakub Kicinski, Romain Perier, Allen Pais, Gustavo A. R. Silva,
	Arnd Bergmann, wengjianfeng, Christophe JAILLET, Lv Yunlong,
	linux-kernel, linux-wireless, netdev, linux-hardening

Kees Cook <keescook@chromium.org> wrote:

> In preparation for FORTIFY_SOURCE performing compile-time and run-time
> field bounds checking for memcpy(), memmove(), and memset(), avoid
> intentionally reading across neighboring array fields. Use the
> sub-structure address directly.
> 
> Signed-off-by: Kees Cook <keescook@chromium.org>

Patch applied to wireless-drivers-next.git, thanks.

3f26f7665c5d mwl8k: Avoid memcpy() over-reading of mcs.rx_mask

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20210617041431.2168953-1-keescook@chromium.org/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-06-22 15:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-17  4:14 [PATCH v2] mwl8k: Avoid memcpy() over-reading of mcs.rx_mask Kees Cook
2021-06-22 15:24 ` Kalle Valo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).