Skip to content

Commit 1a0d247

Browse files
dmantipovjmberg-intel
authored andcommitted
wifi: cfg80211: adjust allocation of colocated AP data
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: c8cb5b8 ("nl80211/cfg80211: support 6 GHz scanning") Signed-off-by: Dmitry Antipov <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Johannes Berg <[email protected]>
1 parent a4058dc commit 1a0d247

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

net/wireless/scan.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -893,9 +893,7 @@ static int cfg80211_scan_6ghz(struct cfg80211_registered_device *rdev)
893893
if (ret)
894894
continue;
895895

896-
entry = kzalloc(sizeof(*entry) + IEEE80211_MAX_SSID_LEN,
897-
GFP_ATOMIC);
898-
896+
entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
899897
if (!entry)
900898
continue;
901899

0 commit comments

Comments
 (0)