diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2019-08-01 09:30:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2019-09-06 12:48:05 +0200 |
| commit | 188113aac7bb1e0daf0014caef7231f2382a18d6 (patch) | |
| tree | 913911676bf0b0b3f27e19c877bd073c8e3ea028 | |
| parent | afeb27efc9e25c0e3620dabadf11d97c96b9099b (diff) | |
mac80211: fix possible sta leakASB-2019-09-05_3.18
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: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I10d1e2cf486c53bd4dcc178616404c7978e4a788
| -rw-r--r-- | net/mac80211/cfg.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index ffe319309d03..00794e0feb76 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1179,6 +1179,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; @@ -1194,10 +1199,6 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev, 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); |