From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 27 Jun 2022 10:49:03 +0000 (+0200)
Subject: wifi: nl80211: acquire wdev mutex for dump_survey
X-Git-Tag: block-6.0-2022-08-12~31^2~64^2~140
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=284b38b6902a7154e3675482418a7b6df47808fe;p=linux-block.git

wifi: nl80211: acquire wdev mutex for dump_survey

At least the quantenna driver calls wdev_chandef() here
which now requires the lock, so acquire it.

Fixes: 7b0a0e3c3a88 ("wifi: cfg80211: do some rework towards MLO link APIs")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index b50ba1803595..886d964242ae 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -10233,7 +10233,9 @@ static int nl80211_dump_survey(struct sk_buff *skb, struct netlink_callback *cb)
 	}
 
 	while (1) {
+		wdev_lock(wdev);
 		res = rdev_dump_survey(rdev, wdev->netdev, survey_idx, &survey);
+		wdev_unlock(wdev);
 		if (res == -ENOENT)
 			break;
 		if (res)