Skip to contentSkip to conversation

mac80211: More strictly validate .abort_scan

PATCH In review Denis Kenzior 2 participants 2 messages Oct 8, 2019 – Oct 11, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mac80211: More strictly validate .abort_scan

nl80211 requires NL80211_CMD_ABORT_SCAN to have a wdev or netdev attribute present and checks that if netdev is provided it is UP. However, mac80211 does not check that an ongoing scan actually belongs to the netdev/wdev provided by the user. In other words, it is possible for an application to cancel scans on an interface it doesn't manage.

---
 net/mac80211/cfg.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
net/mac80211/cfg.c +7 -1
index 70739e746c13..ece344f9e9ca 100644
@@ -2333,7 +2333,13 @@ static int ieee80211_scan(struct wiphy *wiphy,
 
 static void ieee80211_abort_scan(struct wiphy *wiphy, struct wireless_dev *wdev)
 {
-	ieee80211_scan_cancel(wiphy_priv(wiphy));
+	struct ieee80211_local *local = wiphy_priv(wiphy);
+	struct ieee80211_sub_if_data *sdata =
+					IEEE80211_WDEV_TO_SUB_IF(wdev);
+	bool cancel_scan = rcu_access_pointer(local->scan_sdata) == sdata;
+
+	if (cancel_scan)
+		ieee80211_scan_cancel(local);
 }
 
 static int
Signature · 1 line
2.21.0
maintainer
#1 lore raw
Quoted 5 lines · Denis Kenzior

nl80211 requires NL80211_CMD_ABORT_SCAN to have a wdev or netdev attribute present and checks that if netdev is provided it is UP. However, mac80211 does not check that an ongoing scan actually belongs to the netdev/wdev provided by the user. In other words, it is possible for an application to cancel scans on an interface it doesn't manage.

I think you should do this in cfg80211.

johannes