wifi: cfg80211: adjust allocation of colocated AP data

[ Upstream commit 1a0d24775cdee2b8dc14bfa4f4418c930ab1ac57 ]

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>
Link: https://patch.msgid.link/20250113155417.552587-1-dmantipov@yandex.ru
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 348b2fce25fc37ee25df9695f98f9efce2897aa7..670fcdbef95befdd6ec2f7f489b63d282fdd759a 100644 (file)
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -821,9 +821,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;