rtw88: fix null vif pointer when hw_scan fails
Ping-Ke Shih
maintainerPATCH 1/1 rtw88: fix null vif pointer when hw_scan fails
From: Po-Hao Huang <[email protected]>
Add this check to avoid crash by dereferencing a null pointer. When hwscan fails due to no memory or dma failure, the scan flag in ieee80211_local is cleared. So mac80211 determine that it's not hw_scan then calls sw_scan_complete() with null vif, which is also freed during the fail.
--- drivers/net/wireless/realtek/rtw88/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/main.c +4 -1
@@ -1383,9 +1383,12 @@ void rtw_core_scan_start(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif,void rtw_core_scan_complete (struct rtw_dev *rtwdev,struct ieee80211_vif *vif,bool hw_scan) { -struct rtw_vif *rtwvif = (struct rtw_vif *)vif->drv_priv; +struct rtw_vif *rtwvif = vif ? (struct rtw_vif *)vif->drv_priv :NULL ;u32 config =0 ; +if (!rtwvif) +return ; +clear_bit (RTW_FLAG_SCANNING , rtwdev->flags);clear_bit (RTW_FLAG_DIG_DISABLE , rtwdev->flags);
Signature · 1 line
2.25.1
Quoted 9 lines · Ping-Ke Shih
From: Po-Hao Huang <[email protected]>
Add this check to avoid crash by dereferencing a null pointer. When hwscan fails due to no memory or dma failure, the scan flag in
ieee80211_localis cleared. So mac80211 determine that it's nothw_scanthen callssw_scan_complete()with null vif, which is also freed during the fail.Signed-off-by Po-Hao Huang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
Patch applied to wireless-next.git, thanks.
32621eb61bfd rtw88: fix null vif pointer when hw_scan fails
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches