wifi: cfg80211: check wiphy mutex is held for wdev mutex

jmberg-intel · jmberg-intel · commit 1474bc87fe57 · 2023-09-11T11:27:21.000+02:00
This might seem pretty pointless rather than changing the locking
immediately, but it seems safer to run for a while with checks and
the old locking scheme, and then remove the wdev lock later.

Signed-off-by: Johannes Berg &lt;johannes.berg@intel.com&gt;
diff --git a/net/wireless/core.h b/net/wireless/core.h
@@ -238,18 +238,24 @@ void cfg80211_register_wdev(struct cfg80211_registered_device *rdev,
 static inline void wdev_lock(struct wireless_dev *wdev)
 	__acquires(wdev)
 {
+	lockdep_assert_held(&wdev->wiphy->mtx);
 	mutex_lock(&wdev->mtx);
 	__acquire(wdev->mtx);
 }
 
 static inline void wdev_unlock(struct wireless_dev *wdev)
 	__releases(wdev)
 {
+	lockdep_assert_held(&wdev->wiphy->mtx);
 	__release(wdev->mtx);
 	mutex_unlock(&wdev->mtx);
 }
 
-#define ASSERT_WDEV_LOCK(wdev) lockdep_assert_held(&(wdev)->mtx)
+static inline void ASSERT_WDEV_LOCK(struct wireless_dev *wdev)
+{
+	lockdep_assert_held(&wdev->wiphy->mtx);
+	lockdep_assert_held(&wdev->mtx);
+}
 
 static inline bool cfg80211_has_monitors_only(struct cfg80211_registered_device *rdev)
 {

Original file line number	Diff line number	Diff line change
`@@ -238,18 +238,24 @@ void cfg80211_register_wdev(struct cfg80211_registered_device *rdev,`
`238`	`238`	`static inline void wdev_lock(struct wireless_dev *wdev)`
`239`	`239`	`__acquires(wdev)`
`240`	`240`	`{`
	`241`	`+ lockdep_assert_held(&wdev->wiphy->mtx);`
`241`	`242`	`mutex_lock(&wdev->mtx);`
`242`	`243`	`__acquire(wdev->mtx);`
`243`	`244`	`}`
`244`	`245`
`245`	`246`	`static inline void wdev_unlock(struct wireless_dev *wdev)`
`246`	`247`	`__releases(wdev)`
`247`	`248`	`{`
	`249`	`+ lockdep_assert_held(&wdev->wiphy->mtx);`
`248`	`250`	`__release(wdev->mtx);`
`249`	`251`	`mutex_unlock(&wdev->mtx);`
`250`	`252`	`}`
`251`	`253`
`252`		`-#define ASSERT_WDEV_LOCK(wdev) lockdep_assert_held(&(wdev)->mtx)`
	`254`	`+static inline void ASSERT_WDEV_LOCK(struct wireless_dev *wdev)`
	`255`	`+{`
	`256`	`+ lockdep_assert_held(&wdev->wiphy->mtx);`
	`257`	`+ lockdep_assert_held(&wdev->mtx);`
	`258`	`+}`
`253`	`259`
`254`	`260`	`static inline bool cfg80211_has_monitors_only(struct cfg80211_registered_device *rdev)`
`255`	`261`	`{`