Commit c2653990 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: nl80211: acquire wdev mutex earlier in start_ap 



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

Fixes: 7b0a0e3c ("wifi: cfg80211: do some rework towards MLO link APIs")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 206bbcf7

net/wireless/nl80211.c

+13 −12
Original line number Diff line number Diff line
@@ -5771,18 +5771,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]) {








@@ -5795,19 +5797,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;








@@ -5816,7 +5818,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]) {








@@ -5824,7 +5826,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;









		}









	}
















@@ -5836,7 +5838,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]) {








@@ -5844,7 +5846,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]) {








@@ -5852,7 +5854,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]) {








@@ -5863,7 +5865,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);








@@ -5874,7 +5876,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) {