From: Dmitry Antipov Date: Mon, 13 Jan 2025 15:54:17 +0000 (+0300) Subject: wifi: cfg80211: adjust allocation of colocated AP data X-Git-Tag: v5.15.179~551 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d07de96990e68f2e69dd180e697501324d6a36e;p=thirdparty%2Fkernel%2Fstable.git 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 Link: https://patch.msgid.link/20250113155417.552587-1-dmantipov@yandex.ru Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- diff --git a/net/wireless/scan.c b/net/wireless/scan.c index ad857cd1e6f0e..d977d7a7675e1 100644 --- 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;