diff mbox series

[v2] wifi: cfg80211: adjust allocation of colocated AP data

Message ID 20250113155417.552587-1-dmantipov@yandex.ru (mailing list archive)
State New
Delegated to: Johannes Berg
Headers show
Series [v2] wifi: cfg80211: adjust allocation of colocated AP data | expand

Commit Message

Dmitry Antipov Jan. 13, 2025, 3:54 p.m. UTC 
In 'cfg80211_scan_6ghz()', an instances of 'struct cfg80211_colocated_ap'
are allocated as if they would have 'ssid' as trailing VLA member. Since
this is not so, extra IEEE80211_MAX_SSID_LEN bytes are not needed.
Briefly tested with KUnit.

Fixes: c8cb5b854b40 ("nl80211/cfg80211: support 6 GHz scanning")
Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
---
v2: adjusted to apply on top of commit 295adaf455b
("wifi: mac80211: avoid double free in auth/assoc timeout")
---
 net/wireless/scan.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index bc77cfede492..d001272d88d1 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -893,8 +893,7 @@  static int cfg80211_scan_6ghz(struct cfg80211_registered_device *rdev)
 			if (ret)
 				continue;
 
-			entry = kzalloc(sizeof(*entry) + IEEE80211_MAX_SSID_LEN,
-					GFP_ATOMIC);
+			entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
 
 			if (!entry)
 				continue;