[PATCH][next] rtw89: Fix potential dereference of the null pointer sta

Colin King
2021-10-15T15:45:35Z

From: Colin Ian King <colin.king@canonical.com>

The pointer rtwsta is dereferencing pointer sta before sta is
being null checked, so there is a potential null pointer deference
issue that may occur. Fix this by only assigning rtwsta after sta
has been null checked. Add in a null pointer check on rtwsta before
dereferencing it too.

Fixes: e3ec7017f6a2 ("rtw89: add Realtek 802.11ax driver")
Addresses-Coverity: ("Dereference before null check")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/net/wireless/realtek/rtw89/core.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index 06fb6e5b1b37..26f52a25f545 100644
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -1534,9 +1534,14 @@ static bool rtw89_core_txq_agg_wait(struct rtw89_dev *rtwdev,
{
struct rtw89_txq *rtwtxq = (struct rtw89_txq *)txq->drv_priv;
struct ieee80211_sta *sta = txq->sta;
- struct rtw89_sta *rtwsta = (struct rtw89_sta *)sta->drv_priv;
+ struct rtw89_sta *rtwsta;

- if (!sta || rtwsta->max_agg_wait <= 0)
+ if (!sta)
+ return false;
+ rtwsta = (struct rtw89_sta *)sta->drv_priv;
+ if (!rtwsta)
+ return false;
+ if (rtwsta->max_agg_wait <= 0)
return false;

if (rtwdev->stats.tx_tfc_lv <= RTW89_TFC_MID)
--
2.32.0