Commit 4e3b3bcd authored by Larry Finger's avatar Larry Finger Committed by John W. Linville

rtlwifi: rtl8723be: Fix array dimension problems

Commit a619d1ab leads to the following static checker warning:

drivers/net/wireless/rtlwifi/rtl8723be/phy.c:667 _rtl8723be_store_tx_power_by_rate()
error: buffer overflow 'rtlphy->tx_power_by_rate_offset[band]' 4 <= 5

This warning arises because the code is testing the indices for the wrong maximum
values. In addition, the tests merely putput a warning, and then procedes to
corrupt memory. With this change, any such invalid memory access is avoided.
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3ead0d2e
...@@ -629,18 +629,22 @@ static void _rtl8723be_store_tx_power_by_rate(struct ieee80211_hw *hw, ...@@ -629,18 +629,22 @@ static void _rtl8723be_store_tx_power_by_rate(struct ieee80211_hw *hw,
struct rtl_phy *rtlphy = &(rtlpriv->phy); struct rtl_phy *rtlphy = &(rtlpriv->phy);
u8 rate_section = _rtl8723be_get_rate_section_index(regaddr); u8 rate_section = _rtl8723be_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_POWER, PHY_TXPWR, RT_TRACE(rtlpriv, COMP_POWER, PHY_TXPWR,
"Invalid Band %d\n", band); "Invalid Band %d\n", band);
return;
}
if (rfpath > MAX_RF_PATH) if (rfpath > TX_PWR_BY_RATE_NUM_RF) {
RT_TRACE(rtlpriv, COMP_POWER, PHY_TXPWR, RT_TRACE(rtlpriv, COMP_POWER, PHY_TXPWR,
"Invalid RfPath %d\n", rfpath); "Invalid RfPath %d\n", rfpath);
return;
if (txnum > MAX_RF_PATH) }
if (txnum > TX_PWR_BY_RATE_NUM_RF) {
RT_TRACE(rtlpriv, COMP_POWER, PHY_TXPWR, RT_TRACE(rtlpriv, COMP_POWER, PHY_TXPWR,
"Invalid TxNum %d\n", txnum); "Invalid TxNum %d\n", txnum);
return;
}
rtlphy->tx_power_by_rate_offset[band][rfpath][txnum][rate_section] = rtlphy->tx_power_by_rate_offset[band][rfpath][txnum][rate_section] =
data; data;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment