wifi: nl80211: acquire wdev mutex earlier in start_ap

commit c2653990d5729a445296d6d04395be5dea8e282e upstream.

We need to hold the wdev mutex already in order to call
nl80211_parse_tx_bitrate_mask(), so acquire it earlier.

Fixes: 7b0a0e3c3a88 ("wifi: cfg80211: do some rework towards MLO link APIs")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 4a0ea67e385f272d98b1b871a06e1497dba1b846..fc1166819b768b7c24c9602fc4608c281170c704 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -5747,18 +5747,20 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
                goto out;
        }
 
+       wdev_lock(wdev);
+
        if (info->attrs[NL80211_ATTR_TX_RATES]) {
                err = nl80211_parse_tx_bitrate_mask(info, info->attrs,
                                                    NL80211_ATTR_TX_RATES,
                                                    &params->beacon_rate,
                                                    dev, false, link_id);
                if (err)
-                       goto out;
+                       goto out_unlock;
 
                err = validate_beacon_tx_rate(rdev, params->chandef.chan->band,
                                              &params->beacon_rate);
                if (err)
-                       goto out;
+                       goto out_unlock;
        }
 
        if (info->attrs[NL80211_ATTR_SMPS_MODE]) {
@@ -5771,19 +5773,19 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
                        if (!(rdev->wiphy.features &
                              NL80211_FEATURE_STATIC_SMPS)) {
                                err = -EINVAL;
-                               goto out;
+                               goto out_unlock;
                        }
                        break;
                case NL80211_SMPS_DYNAMIC:
                        if (!(rdev->wiphy.features &
                              NL80211_FEATURE_DYNAMIC_SMPS)) {
                                err = -EINVAL;
-                               goto out;
+                               goto out_unlock;
                        }
                        break;
                default:
                        err = -EINVAL;
-                       goto out;
+                       goto out_unlock;
                }
        } else {
                params->smps_mode = NL80211_SMPS_OFF;
@@ -5792,7 +5794,7 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
        params->pbss = nla_get_flag(info->attrs[NL80211_ATTR_PBSS]);
        if (params->pbss && !rdev->wiphy.bands[NL80211_BAND_60GHZ]) {
                err = -EOPNOTSUPP;
-               goto out;
+               goto out_unlock;
        }
 
        if (info->attrs[NL80211_ATTR_ACL_POLICY]) {
@@ -5800,7 +5802,7 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
                if (IS_ERR(params->acl)) {
                        err = PTR_ERR(params->acl);
                        params->acl = NULL;
-                       goto out;
+                       goto out_unlock;
                }
        }
 
@@ -5812,7 +5814,7 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
                                        info->attrs[NL80211_ATTR_HE_OBSS_PD],
                                        &params->he_obss_pd);
                if (err)
-                       goto out;
+                       goto out_unlock;
        }
 
        if (info->attrs[NL80211_ATTR_FILS_DISCOVERY]) {
@@ -5820,7 +5822,7 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
                                                   info->attrs[NL80211_ATTR_FILS_DISCOVERY],
                                                   params);
                if (err)
-                       goto out;
+                       goto out_unlock;
        }
 
        if (info->attrs[NL80211_ATTR_UNSOL_BCAST_PROBE_RESP]) {
@@ -5828,7 +5830,7 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
                        rdev, info->attrs[NL80211_ATTR_UNSOL_BCAST_PROBE_RESP],
                        params);
                if (err)
-                       goto out;
+                       goto out_unlock;
        }
 
        if (info->attrs[NL80211_ATTR_MBSSID_CONFIG]) {
@@ -5839,7 +5841,7 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
                                                        params->beacon.mbssid_ies->cnt :
                                                        0);
                if (err)
-                       goto out;
+                       goto out_unlock;
        }
 
        nl80211_calculate_ap_params(params);
@@ -5850,7 +5852,6 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
        else if (info->attrs[NL80211_ATTR_EXTERNAL_AUTH_SUPPORT])
                params->flags |= NL80211_AP_SETTINGS_EXTERNAL_AUTH_SUPPORT;
 
-       wdev_lock(wdev);
        if (wdev->conn_owner_nlportid &&
            info->attrs[NL80211_ATTR_SOCKET_OWNER] &&
            wdev->conn_owner_nlportid != info->snd_portid) {