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

jmberg-intel · gregkh · commit 268f84a82753 · 2024-08-29T17:33:23.000+02:00
[ Upstream commit 1474bc8 ] 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 <johannes.berg@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git a/net/wireless/core.h b/net/wireless/core.h
@@ -228,18 +228,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
`@@ -228,18 +228,24 @@ void cfg80211_register_wdev(struct cfg80211_registered_device *rdev,`
`228`	`228`	`static inline void wdev_lock(struct wireless_dev *wdev)`
`229`	`229`	`__acquires(wdev)`
`230`	`230`	`{`
	`231`	`+ lockdep_assert_held(&wdev->wiphy->mtx);`
`231`	`232`	`mutex_lock(&wdev->mtx);`
`232`	`233`	`__acquire(wdev->mtx);`
`233`	`234`	`}`
`234`	`235`
`235`	`236`	`static inline void wdev_unlock(struct wireless_dev *wdev)`
`236`	`237`	`__releases(wdev)`
`237`	`238`	`{`
	`239`	`+ lockdep_assert_held(&wdev->wiphy->mtx);`
`238`	`240`	`__release(wdev->mtx);`
`239`	`241`	`mutex_unlock(&wdev->mtx);`
`240`	`242`	`}`
`241`	`243`
`242`		`-#define ASSERT_WDEV_LOCK(wdev) lockdep_assert_held(&(wdev)->mtx)`
	`244`	`+static inline void ASSERT_WDEV_LOCK(struct wireless_dev *wdev)`
	`245`	`+{`
	`246`	`+ lockdep_assert_held(&wdev->wiphy->mtx);`
	`247`	`+ lockdep_assert_held(&wdev->mtx);`
	`248`	`+}`
`243`	`249`
`244`	`250`	`static inline bool cfg80211_has_monitors_only(struct cfg80211_registered_device *rdev)`
`245`	`251`	`{`