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

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

cfg80211: add missing device list locking 



When calling into the wext code from the NETDEV_UP
notifier, we need to hold the devlist_mtx mutex as
the wext code ends up calling into channel checks.

Reported-by: default avatarKalle Valo <kalle.valo@iki.fi>
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Tested-by: default avatarKalle Valo <kalle.valo@iki.fi>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent af6a3fc7

net/wireless/core.c

+2 −0
Original line number Diff line number Diff line
@@ -710,6 +710,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, 
	case NETDEV_UP:

#ifdef CONFIG_WIRELESS_EXT

		cfg80211_lock_rdev(rdev);

		mutex_lock(&rdev->devlist_mtx);

		wdev_lock(wdev);

		switch (wdev->iftype) {

		case NL80211_IFTYPE_ADHOC:
@@ -722,6 +723,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, 
			break;

		}

		wdev_unlock(wdev);

		mutex_unlock(&rdev->devlist_mtx);

		cfg80211_unlock_rdev(rdev);

#endif

		break;