summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2021-04-16 09:42:14 +0200
committerJohannes Berg <johannes.berg@intel.com>2021-04-19 13:25:50 +0200
commit010bfbe768f7ecc876ffba92db30432de4997e2a (patch)
treeeb24755fe5a83b47a21c8b4685723b13be09b68c /net/wireless
parent2f5164447cdab6419edddde3a214f93a53aa4e60 (diff)
downloadlinux-010bfbe768f7ecc876ffba92db30432de4997e2a.tar.bz2
cfg80211: scan: drop entry from hidden_list on overflow
If we overflow the maximum number of BSS entries and free the new entry, drop it from any hidden_list that it may have been added to in the code above or in cfg80211_combine_bsses(). Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Link: https://lore.kernel.org/r/20210416094212.5de7d1676ad7.Ied283b0bc5f504845e7d6ab90626bdfa68bb3dc0@changeid Cc: stable@vger.kernel.org Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/scan.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index c3b51efff5c6..b21058698a9f 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -1751,6 +1751,8 @@ cfg80211_bss_update(struct cfg80211_registered_device *rdev,
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);
goto drop;
}