mac80211: fix possible sta leak

If TDLS station addition is rejected, the sta memory is leaked. Avoid this by moving the check before the allocation. Cc: [email protected] Fixes: 7ed5285 ("mac80211: don't initiate TDLS connection if station is not associated to AP") Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Johannes Berg <[email protected]>
strager · Aug 21, 2019 · 5fd2f91 · 5fd2f91
1 parent a1c4cd6
commit 5fd2f91
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
@@ -1546,17 +1546,18 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
 	if (is_multicast_ether_addr(mac))
 		return -EINVAL;
 
+	if (params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER) &&
+	    sdata->vif.type == NL80211_IFTYPE_STATION &&
+	    !sdata->u.mgd.associated)
+		return -EINVAL;
+
 	sta = sta_info_alloc(sdata, mac, GFP_KERNEL);
 	if (!sta)
 		return -ENOMEM;
 
 	if (params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER))
 		sta->sta.tdls = true;
 
-	if (sta->sta.tdls && sdata->vif.type == NL80211_IFTYPE_STATION &&
-	    !sdata->u.mgd.associated)
-		return -EINVAL;
-
 	err = sta_apply_parameters(local, sta, params);
 	if (err) {
 		sta_info_free(local, sta);