diff options
| author | Lorenzo Bianconi <lorenzo@kernel.org> | 2019-07-03 00:29:47 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2019-07-20 21:39:26 +0200 |
| commit | bcc27fab8cc673ddc95452674373cce618ccb3a3 (patch) | |
| tree | 5c61acd6f44500947f47736f5de9cc747a62a2b2 /net/mac80211 | |
| parent | 5edaac063bbf1267260ad2a5b9bb803399343e58 (diff) | |
| download | linux-stable-bcc27fab8cc673ddc95452674373cce618ccb3a3.tar.gz linux-stable-bcc27fab8cc673ddc95452674373cce618ccb3a3.tar.bz2 linux-stable-bcc27fab8cc673ddc95452674373cce618ccb3a3.zip | |
mac80211: fix possible memory leak in ieee80211_assign_beacon
Free new beacon_data in ieee80211_assign_beacon whenever
ieee80211_assign_beacon fails
Fixes: 8860020e0be1 ("cfg80211: restructure AP/GO mode API")
Fixes: bc847970f432 ("mac80211: support FTM responder configuration/statistic")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://lore.kernel.org/r/770285772543c9fca33777bb4ad4760239e56256.1562105631.git.lorenzo@kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/cfg.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 76cc9e967fa6..4d458067d80d 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -936,8 +936,10 @@ static int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata, err = ieee80211_set_probe_resp(sdata, params->probe_resp, params->probe_resp_len, csa); - if (err < 0) + if (err < 0) { + kfree(new); return err; + } if (err == 0) changed |= BSS_CHANGED_AP_PROBE_RESP; @@ -949,8 +951,10 @@ static int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata, params->civicloc, params->civicloc_len); - if (err < 0) + if (err < 0) { + kfree(new); return err; + } changed |= BSS_CHANGED_FTM_RESPONDER; } |