OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5edaac0
)
mac80211: fix possible memory leak in ieee80211_assign_beacon
author
Lorenzo Bianconi
<lorenzo@kernel.org>
Tue, 2 Jul 2019 22:29:47 +0000
(
00:29
+0200)
committer
Johannes Berg
<johannes.berg@intel.com>
Sat, 20 Jul 2019 19:39:26 +0000
(21:39 +0200)
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>
net/mac80211/cfg.c
patch
|
blob
|
history
diff --git
a/net/mac80211/cfg.c
b/net/mac80211/cfg.c
index
76cc9e9
..
4d45806
100644
(file)
--- 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;
}