Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01a0ac41 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

cfg80211: check lost scans later, fix bug 



When we lose a scan, cfg80211 tries to clean up after
the driver. However, it currently does this too early,
it does this in GOING_DOWN already instead of DOWN, so
it may happen with mac80211. Besides fixing this, also
make it more robust by leaking the scan request so if
the driver later actually finishes the scan, it won't
crash. Also check in ___cfg80211_scan_done whether a
scan request is still pending and exit if not.

Reported-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Tested-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 40ba60dd

net/wireless/core.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -664,7 +664,7 @@ static void wdev_cleanup_work(struct work_struct *work) 




	if (WARN_ON(rdev->scan_req && rdev->scan_req->dev == wdev->netdev)) {

	if (WARN_ON(rdev->scan_req && rdev->scan_req->dev == wdev->netdev)) {

		rdev->scan_req->aborted = true;

		rdev->scan_req->aborted = true;

		___cfg80211_scan_done(rdev);

		___cfg80211_scan_done(rdev, true);

	}

	}





	cfg80211_unlock_rdev(rdev);

	cfg80211_unlock_rdev(rdev);
@@ -755,6 +755,8 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, 
		default:

		default:

			break;

			break;

		}

		}

		break;

	case NETDEV_DOWN:

		dev_hold(dev);

		dev_hold(dev);

		schedule_work(&wdev->cleanup_work);

		schedule_work(&wdev->cleanup_work);

		break;

		break;

net/wireless/core.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -370,7 +370,7 @@ void cfg80211_sme_scan_done(struct net_device *dev); 
void cfg80211_sme_rx_auth(struct net_device *dev, const u8 *buf, size_t len);

void cfg80211_sme_rx_auth(struct net_device *dev, const u8 *buf, size_t len);

void cfg80211_sme_disassoc(struct net_device *dev, int idx);

void cfg80211_sme_disassoc(struct net_device *dev, int idx);

void __cfg80211_scan_done(struct work_struct *wk);

void __cfg80211_scan_done(struct work_struct *wk);

void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev);

void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev, bool leak);

void cfg80211_upload_connect_keys(struct wireless_dev *wdev);

void cfg80211_upload_connect_keys(struct wireless_dev *wdev);





struct ieee80211_channel *

struct ieee80211_channel *

net/wireless/scan.c

+18 −3
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 




#define IEEE80211_SCAN_RESULT_EXPIRE	(15 * HZ)

#define IEEE80211_SCAN_RESULT_EXPIRE	(15 * HZ)





void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev)

void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev, bool leak)

{

{

	struct cfg80211_scan_request *request;

	struct cfg80211_scan_request *request;

	struct net_device *dev;

	struct net_device *dev;
@@ -26,8 +26,13 @@ void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev) 
	union iwreq_data wrqu;

	union iwreq_data wrqu;

#endif

#endif





	ASSERT_RDEV_LOCK(rdev);



	request = rdev->scan_req;

	request = rdev->scan_req;





	if (!request)

		return;



	dev = request->dev;

	dev = request->dev;





	/*

	/*
@@ -53,6 +58,16 @@ void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev) 
	dev_put(dev);

	dev_put(dev);





	rdev->scan_req = NULL;

	rdev->scan_req = NULL;



	/*

	 * OK. If this is invoked with "leak" then we can't

	 * free this ... but we've cleaned it up anyway. The

	 * driver failed to call the scan_done callback, so

	 * all bets are off, it might still be trying to use

	 * the scan request or not ... if it accesses the dev

	 * in there (it shouldn't anyway) then it may crash.

	 */

	if (!leak)

		kfree(request);

		kfree(request);

}

}
@@ -64,7 +79,7 @@ void __cfg80211_scan_done(struct work_struct *wk) 
			    scan_done_wk);

			    scan_done_wk);





	cfg80211_lock_rdev(rdev);

	cfg80211_lock_rdev(rdev);

	___cfg80211_scan_done(rdev);

	___cfg80211_scan_done(rdev, false);

	cfg80211_unlock_rdev(rdev);

	cfg80211_unlock_rdev(rdev);

}

}