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>

diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 46ecb10e85fb42cc4f1b38cecc485615c12c9670..287518c6caa40204525993d8b2477e269324f378 100644 (file)
--- 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 */