[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <92f5a610-a623-b17d-40ba-963e3e84c622@lwfinger.net>
Date: Thu, 17 Jun 2021 13:16:09 -0500
From: Larry Finger <Larry.Finger@...inger.net>
To: Kees Cook <keescook@...omium.org>,
Kalle Valo <kvalo@...eaurora.org>
Cc: Ping-Ke Shih <pkshih@...ltek.com>,
"David S. Miller" <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>,
Kaixu Xia <kaixuxia@...cent.com>, linux-kernel@...r.kernel.org,
linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
linux-hardening@...r.kernel.org
Subject: Re: [PATCH] rtlwifi: rtl8192de: Fully initialize curvecount_val
On 6/17/21 12:13 PM, Kees Cook wrote:
> 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.
>
> The size argument to memset() is bytes, but the array element size
> of curvecount_val is u32, so "CV_CURVE_CNT * 2" was only 1/4th of the
> contents of curvecount_val. Adjust memset() to wipe full buffer size.
>
> Signed-off-by: Kees Cook <keescook@...omium.org>
> ---
> drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
> index 68ec009ea157..76dd881ef9bb 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
> +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c
> @@ -2574,7 +2574,7 @@ static void _rtl92d_phy_lc_calibrate_sw(struct ieee80211_hw *hw, bool is2t)
> RTPRINT(rtlpriv, FINIT, INIT_IQK,
> "path-B / 2.4G LCK\n");
> }
> - memset(&curvecount_val[0], 0, CV_CURVE_CNT * 2);
> + memset(curvecount_val, 0, sizeof(curvecount_val));
> /* Set LC calibration off */
> rtl_set_rfreg(hw, (enum radio_path)index, RF_CHNLBW,
> 0x08000, 0x0);
>
Reviewed-by: Larry Finger <Larry.Finger@...inger.net>
Powered by blists - more mailing lists