2023-01-06 12:20:10

by Ping-Ke Shih

Subject: [PATCH 1/2] wifi: rtw89: fix null vif pointer when get management frame date rate

From: Kuan-Chung Chen <[email protected]>

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 <[email protected]>
Signed-off-by: Ping-Ke Shih <[email protected]>
---
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 adc961752a291..f06840634e113 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.25.1

2023-01-16 13:43:17

by Kalle Valo

Subject: Re: [PATCH 1/2] wifi: rtw89: fix null vif pointer when get management frame date rate

Ping-Ke Shih <[email protected]> wrote:

> From: Kuan-Chung Chen <[email protected]>
>
> 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 <[email protected]>
> Signed-off-by: Ping-Ke Shih <[email protected]>

2 patches applied to wireless-next.git, thanks.

95dafeabe477 wifi: rtw89: fix null vif pointer when get management frame date rate
877287f971b1 wifi: rtw89: set the correct mac_id for management frames

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches