wifi: cfg80211: lock wiphy mutex for rfkill poll

jmberg-intel · jmberg-intel · commit 8e2f6f236621 · 2023-11-24T18:30:09.000+01:00
We want to guarantee the mutex is held for pretty much
all operations, so ensure that here as well.

Reported-by: syzbot+7e59a5bfc7a897247e18@syzkaller.appspotmail.com
Signed-off-by: Johannes Berg &lt;johannes.berg@intel.com&gt;
diff --git a/net/wireless/core.c b/net/wireless/core.c
@@ -221,7 +221,9 @@ static void cfg80211_rfkill_poll(struct rfkill *rfkill, void *data)
 {
 	struct cfg80211_registered_device *rdev = data;
 
+	wiphy_lock(&rdev->wiphy);
 	rdev_rfkill_poll(rdev);
+	wiphy_unlock(&rdev->wiphy);
 }
 
 void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev,

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,9 @@ static void cfg80211_rfkill_poll(struct rfkill rfkill, void data)`
`221`	`221`	`{`
`222`	`222`	`struct cfg80211_registered_device *rdev = data;`
`223`	`223`
	`224`	`+ wiphy_lock(&rdev->wiphy);`
`224`	`225`	`rdev_rfkill_poll(rdev);`
	`226`	`+ wiphy_unlock(&rdev->wiphy);`
`225`	`227`	`}`
`226`	`228`
`227`	`229`	`void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev,`