summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorSara Sharon <sara.sharon@intel.com>2019-01-30 08:48:21 +0200
committerJohannes Berg <johannes.berg@intel.com>2019-02-08 13:56:37 +0100
commitbede8d2996475017918364ec3d0d2bc1558659e1 (patch)
treec3d78bb8831a210c65f83536d23435c343041158 /net/wireless
parentc17fe043a3b79255c6cbe76aafb594849fac0005 (diff)
downloadlinux-bede8d2996475017918364ec3d0d2bc1558659e1.tar.bz2
cfg80211: fix memory leak of new_ie
new_ie is used as a temporary storage for the generation of the new elements. However, after copying from it the memory wasn't freed and leaked. Free it. Signed-off-by: Sara Sharon <sara.sharon@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/scan.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 46ecb10e85fb..287518c6caa4 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -1576,10 +1576,8 @@ cfg80211_update_notlisted_nontrans(struct wiphy *wiphy,
if (!new_ie)
return;
new_ies = kzalloc(sizeof(*new_ies) + new_ie_len, gfp);
- if (!new_ies) {
- kfree(new_ie);
- return;
- }
+ if (!new_ies)
+ goto out_free;
pos = new_ie;
@@ -1613,6 +1611,9 @@ cfg80211_update_notlisted_nontrans(struct wiphy *wiphy,
if (old)
kfree_rcu((struct cfg80211_bss_ies *)old, rcu_head);
}
+
+out_free:
+ kfree(new_ie);
}
/* cfg80211_inform_bss_width_frame helper */