From: Andrew Lunn <andrew@lunn.ch>
To: Kees Cook <keescook@chromium.org>
Cc: netdev@vger.kernel.org,
Lennert Buytenhek <buytenh@wantstofly.org>,
Kalle Valo <kvalo@codeaurora.org>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Romain Perier <romain.perier@gmail.com>,
Allen Pais <allen.lkml@gmail.com>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
Arnd Bergmann <arnd@arndb.de>,
wengjianfeng <wengjianfeng@yulong.com>,
Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
Lv Yunlong <lyl2019@mail.ustc.edu.cn>,
linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org,
linux-hardening@vger.kernel.org
Subject: Re: [PATCH] mwl8k: Avoid memcpy() over-reading of ETH_SS_STATS
Date: Wed, 16 Jun 2021 21:58:09 +0200 [thread overview]
Message-ID: <YMpX0S/Xeis0kKoP@lunn.ch> (raw)
In-Reply-To: <20210616195242.1231287-1-keescook@chromium.org>
On Wed, Jun 16, 2021 at 12:52:42PM -0700, Kees Cook 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>
> ---
> 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();
This does not appear to have anything to do with ETH_SS_STATS which is
what the Subject: says.
Andrew
next prev parent reply other threads:[~2021-06-16 19:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 19:52 [PATCH] mwl8k: Avoid memcpy() over-reading of ETH_SS_STATS Kees Cook
2021-06-16 19:58 ` Andrew Lunn [this message]
2021-06-17 3:22 ` Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YMpX0S/Xeis0kKoP@lunn.ch \
--to=andrew@lunn.ch \
--cc=allen.lkml@gmail.com \
--cc=arnd@arndb.de \
--cc=buytenh@wantstofly.org \
--cc=christophe.jaillet@wanadoo.fr \
--cc=davem@davemloft.net \
--cc=gustavoars@kernel.org \
--cc=keescook@chromium.org \
--cc=kuba@kernel.org \
--cc=kvalo@codeaurora.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lyl2019@mail.ustc.edu.cn \
--cc=netdev@vger.kernel.org \
--cc=romain.perier@gmail.com \
--cc=wengjianfeng@yulong.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).