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

[ Upstream commit 1474bc87fe57deac726cc10203f73daa6c3212f7 ]

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
index 1720abf36f92a314a329f46d8bc07ba85a4ef241..be186b5a15f3dbdfab2baa24c7e7778071b4f93b 100644 (file)
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -217,6 +217,7 @@ 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);
 }
@@ -224,11 +225,16 @@ static inline void wdev_lock(struct wireless_dev *wdev)
 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)
 {