Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c251d5c5 authored by Johannes Berg's avatar Johannes Berg Committed by Greg Kroah-Hartman
Browse files

mac80211: fix possible sta leak 

commit 5fd2f91ad483baffdbe798f8a08f1b41442d1e24 upstream.

If TDLS station addition is rejected, the sta memory is leaked.
Avoid this by moving the check before the allocation.

Cc: stable@vger.kernel.org
Fixes: 7ed5285396c2 ("mac80211: don't initiate TDLS connection if station is not associated to AP")
Link: https://lore.kernel.org/r/20190801073033.7892-1-johannes@sipsolutions.net


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ac8c7677

net/mac80211/cfg.c

+5 −4
Original line number Diff line number Diff line
@@ -1418,6 +1418,11 @@ 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;
@@ -1425,10 +1430,6 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev, 
	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);