Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d514aefb authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: rtl8821ae: Fix possible array overrun 



The kbuild test robot reported a possible array overrun. The affected code
checks for overruns, but fails to take the steps necessary to fix them.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 868caae3

drivers/net/wireless/rtlwifi/rtl8821ae/phy.c

+9 −6
Original line number Diff line number Diff line
@@ -1889,15 +1889,18 @@ static void _rtl8821ae_store_tx_power_by_rate(struct ieee80211_hw *hw, 
	struct rtl_phy *rtlphy = &rtlpriv->phy;

	u8 rate_section = _rtl8821ae_get_rate_section_index(regaddr);



	if (band != BAND_ON_2_4G && band != BAND_ON_5G)

	if (band != BAND_ON_2_4G && band != BAND_ON_5G) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_WARNING, "Invalid Band %d\n", band);



	if (rfpath >= MAX_RF_PATH)

		band = BAND_ON_2_4G;

	}

	if (rfpath >= MAX_RF_PATH) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_WARNING, "Invalid RfPath %d\n", rfpath);



	if (txnum >= MAX_RF_PATH)

		rfpath = MAX_RF_PATH - 1;

	}

	if (txnum >= MAX_RF_PATH) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_WARNING, "Invalid TxNum %d\n", txnum);



		txnum = MAX_RF_PATH - 1;

	}

	rtlphy->tx_power_by_rate_offset[band][rfpath][txnum][rate_section] = data;

	RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,

		 "TxPwrByRateOffset[Band %d][RfPath %d][TxNum %d][RateSection %d] = 0x%x\n",