Skip to content

Commit e477916

Browse files
fishilicoKalle Valo
authored andcommitted
rtlwifi: always initialize variables given to RT_TRACE()
In rtl_rx_ampdu_apply(), when rtlpriv->cfg->ops->get_btc_status() returns false, RT_TRACE() is called with the values of variables reject_agg and agg_size, which have not been initialized. Always initialize these variables in order to prevent using uninitialized values. This issue has been found with clang. The compiler reported: drivers/net/wireless/realtek/rtlwifi/base.c:1665:6: error: variable 'agg_size' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] if (rtlpriv->cfg->ops->get_btc_status()) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/net/wireless/realtek/rtlwifi/base.c:1671:31: note: uninitialized use occurs here reject_agg, ctrl_agg_size, agg_size); ^~~~~~~~ drivers/net/wireless/realtek/rtlwifi/base.c:1665:6: error: variable 'reject_agg' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] if (rtlpriv->cfg->ops->get_btc_status()) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/net/wireless/realtek/rtlwifi/base.c:1671:4: note: uninitialized use occurs here reject_agg, ctrl_agg_size, agg_size); ^~~~~~~~~~ Fixes: 2635664 ("rtlwifi: Add rx ampdu cfg for btcoexist.") Signed-off-by: Nicolas Iooss <[email protected]> Signed-off-by: Kalle Valo <[email protected]>
1 parent b7573a0 commit e477916

File tree

1 file changed

+1
-1
lines changed
  • drivers/net/wireless/realtek/rtlwifi

1 file changed

+1
-1
lines changed

drivers/net/wireless/realtek/rtlwifi/base.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1726,7 +1726,7 @@ int rtl_tx_agg_oper(struct ieee80211_hw *hw,
17261726
void rtl_rx_ampdu_apply(struct rtl_priv *rtlpriv)
17271727
{
17281728
struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;
1729-
u8 reject_agg, ctrl_agg_size = 0, agg_size;
1729+
u8 reject_agg = 0, ctrl_agg_size = 0, agg_size = 0;
17301730

17311731
if (rtlpriv->cfg->ops->get_btc_status())
17321732
btc_ops->btc_get_ampdu_cfg(rtlpriv, &reject_agg,

0 commit comments

Comments
 (0)