summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorNguyen Dinh Phi <phind.uet@gmail.com>2021-06-28 21:23:34 +0800
committerJohannes Berg <johannes.berg@intel.com>2021-07-23 10:38:18 +0200
commitf9a5c358c8d26fed0cc45f2afc64633d4ba21dff (patch)
tree4bd9a74ae3fd97b1a37d41255a4c207b32ab5fba /net/wireless
parent0d059964504a1605d84938c0b5b38f6573121c4a (diff)
downloadlinux-stable-f9a5c358c8d26fed0cc45f2afc64633d4ba21dff.tar.gz
linux-stable-f9a5c358c8d26fed0cc45f2afc64633d4ba21dff.tar.bz2
linux-stable-f9a5c358c8d26fed0cc45f2afc64633d4ba21dff.zip
cfg80211: Fix possible memory leak in function cfg80211_bss_update
When we exceed the limit of BSS entries, this function will free the new entry, however, at this time, it is the last door to access the inputed ies, so these ies will be unreferenced objects and cause memory leak. Therefore we should free its ies before deallocating the new entry, beside of dropping it from hidden_list. Signed-off-by: Nguyen Dinh Phi <phind.uet@gmail.com> Link: https://lore.kernel.org/r/20210628132334.851095-1-phind.uet@gmail.com Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/scan.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index f03c7ac8e184..7897b1478c3c 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -1754,16 +1754,14 @@ cfg80211_bss_update(struct cfg80211_registered_device *rdev,
* be grouped with this beacon for updates ...
*/
if (!cfg80211_combine_bsses(rdev, new)) {
- kfree(new);
+ bss_ref_put(rdev, new);
goto drop;
}
}
if (rdev->bss_entries >= bss_entries_limit &&
!cfg80211_bss_expire_oldest(rdev)) {
- if (!list_empty(&new->hidden_list))
- list_del(&new->hidden_list);
- kfree(new);
+ bss_ref_put(rdev, new);
goto drop;
}