36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
|
From 2c38c23599936fdfc45dfdf155720e481112e8a6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Kuan-Chung Chen <damon.chen@realtek.com>
|
||
|
|
Date: Fri, 6 Jan 2023 20:15:16 +0800
|
||
|
|
Subject: [PATCH 390/391] wifi: rtw89: fix null vif pointer when get management
|
||
|
|
frame date rate
|
||
|
|
|
||
|
|
When transmitting a packet that gets from ieee80211_nullfunc_get(),
|
||
|
|
the vif in tx_info->control was no assigned, which will cause
|
||
|
|
dereferencing a null pointer.
|
||
|
|
|
||
|
|
Signed-off-by: Kuan-Chung Chen <damon.chen@realtek.com>
|
||
|
|
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
|
||
|
|
Signed-off-by: Kalle Valo <kvalo@kernel.org>
|
||
|
|
Link: https://lore.kernel.org/r/20230106121517.19841-1-pkshih@realtek.com
|
||
|
|
---
|
||
|
|
drivers/net/wireless/realtek/rtw89/core.c | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
|
||
|
|
index e99eccf11..8a923c07f 100644
|
||
|
|
--- a/drivers/net/wireless/realtek/rtw89/core.c
|
||
|
|
+++ b/drivers/net/wireless/realtek/rtw89/core.c
|
||
|
|
@@ -498,7 +498,8 @@ static u16 rtw89_core_get_mgmt_rate(struct rtw89_dev *rtwdev,
|
||
|
|
const struct rtw89_chan *chan = rtw89_chan_get(rtwdev, RTW89_SUB_ENTITY_0);
|
||
|
|
u16 lowest_rate;
|
||
|
|
|
||
|
|
- if (tx_info->flags & IEEE80211_TX_CTL_NO_CCK_RATE || vif->p2p)
|
||
|
|
+ if (tx_info->flags & IEEE80211_TX_CTL_NO_CCK_RATE ||
|
||
|
|
+ (vif && vif->p2p))
|
||
|
|
lowest_rate = RTW89_HW_RATE_OFDM6;
|
||
|
|
else if (chan->band_type == RTW89_BAND_2G)
|
||
|
|
lowest_rate = RTW89_HW_RATE_CCK1;
|
||
|
|
--
|
||
|
|
2.35.3
|
||
|
|
|