Commit a1b8015d authored by Po-Hao Huang's avatar Po-Hao Huang Committed by Kalle Valo
Browse files

wifi: rtw88: prevent scan abort with other VIFs 



Only abort scan with current scanning VIF. If we have more than one
interface, we could call rtw_hw_scan_abort() with the wrong VIF as
input. This avoids potential null pointer being accessed when actually
the other VIF is scanning.

Signed-off-by: default avatarPo-Hao Huang <phhuang@realtek.com>
Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230414121312.17954-1-pkshih@realtek.com
parent 982f4a20

drivers/net/wireless/realtek/rtw88/fw.c

+3 −1
Original line number Diff line number Diff line
@@ -2163,8 +2163,10 @@ int rtw_hw_scan_offload(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, 
	return ret;

}



void rtw_hw_scan_abort(struct rtw_dev *rtwdev, struct ieee80211_vif *vif)

void rtw_hw_scan_abort(struct rtw_dev *rtwdev)

{

	struct ieee80211_vif *vif = rtwdev->scan_info.scanning_vif;



	if (!rtw_fw_feature_check(&rtwdev->fw, FW_FEATURE_SCAN_OFFLOAD))

		return;

drivers/net/wireless/realtek/rtw88/fw.h

+1 −1
Original line number Diff line number Diff line
@@ -868,5 +868,5 @@ int rtw_hw_scan_offload(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, 
			bool enable);

void rtw_hw_scan_status_report(struct rtw_dev *rtwdev, struct sk_buff *skb);

void rtw_hw_scan_chan_switch(struct rtw_dev *rtwdev, struct sk_buff *skb);

void rtw_hw_scan_abort(struct rtw_dev *rtwdev, struct ieee80211_vif *vif);

void rtw_hw_scan_abort(struct rtw_dev *rtwdev);

#endif

drivers/net/wireless/realtek/rtw88/mac80211.c

+4 −3
Original line number Diff line number Diff line
@@ -393,7 +393,8 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw, 
			 * when disconnected by peer

			 */

			if (test_bit(RTW_FLAG_SCANNING, rtwdev->flags))

				rtw_hw_scan_abort(rtwdev, vif);

				rtw_hw_scan_abort(rtwdev);



		}



		config |= PORT_SET_NET_TYPE;
@@ -870,7 +871,7 @@ static int rtw_ops_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	rtw_hw_scan_start(rtwdev, vif, req);

	ret = rtw_hw_scan_offload(rtwdev, vif, true);

	if (ret) {

		rtw_hw_scan_abort(rtwdev, vif);

		rtw_hw_scan_abort(rtwdev);

		rtw_err(rtwdev, "HW scan failed with status: %d\n", ret);

	}

	mutex_unlock(&rtwdev->mutex);
@@ -890,7 +891,7 @@ static void rtw_ops_cancel_hw_scan(struct ieee80211_hw *hw, 
		return;



	mutex_lock(&rtwdev->mutex);

	rtw_hw_scan_abort(rtwdev, vif);

	rtw_hw_scan_abort(rtwdev);

	mutex_unlock(&rtwdev->mutex);

}