wifi: nl80211: hold wdev mutex for channel switch APIs

Since we deal with links in an MLD here, hold the wdev
mutex now.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 26d277c14fd414515cf4b4c091524b8cb655a1f3..59ea1157969eed181053b1b5a89d5fec3953dbf0 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3348,8 +3348,13 @@ static int nl80211_set_channel(struct sk_buff *skb, struct genl_info *info)
        struct cfg80211_registered_device *rdev = info->user_ptr[0];
        int link_id = nl80211_link_id_or_invalid(info->attrs);
        struct net_device *netdev = info->user_ptr[1];
+       int ret;
+
+       wdev_lock(netdev->ieee80211_ptr);
+       ret = __nl80211_set_channel(rdev, netdev, info, link_id);
+       wdev_unlock(netdev->ieee80211_ptr);
 
-       return __nl80211_set_channel(rdev, netdev, info, link_id);
+       return ret;
 }
 
 static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
@@ -3461,10 +3466,16 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
        }
 
        if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
-               result = __nl80211_set_channel(
-                       rdev,
-                       nl80211_can_set_dev_channel(wdev) ? netdev : NULL,
-                       info, -1);
+               if (wdev) {
+                       wdev_lock(wdev);
+                       result = __nl80211_set_channel(
+                               rdev,
+                               nl80211_can_set_dev_channel(wdev) ? netdev : NULL,
+                               info, -1);
+                       wdev_unlock(wdev);
+               } else {
+                       result = __nl80211_set_channel(rdev, netdev, info, -1);
+               }
                if (result)
                        goto out;
        }