]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: wilc1000: fix ies_len type in connect path
authorJozef Hopko <jozef.hopko@altana.com>
Mon, 1 Jul 2024 16:23:20 +0000 (18:23 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Jul 2024 09:40:50 +0000 (11:40 +0200)
[ Upstream commit 39ab8fff623053a50951b659e5f6b72343d7d78c ]

Commit 205c50306acf ("wifi: wilc1000: fix RCU usage in connect path")
made sure that the IEs data was manipulated under the relevant RCU section.
Unfortunately, while doing so, the commit brought a faulty implicit cast
from int to u8 on the ies_len variable, making the parsing fail to be
performed correctly if the IEs block is larger than 255 bytes. This failure
can be observed with Access Points appending a lot of IEs TLVs in their
beacon frames (reproduced with a Pixel phone acting as an Access Point,
which brough 273 bytes of IE data in my testing environment).

Fix IEs parsing by removing this undesired implicit cast.

Fixes: 205c50306acf ("wifi: wilc1000: fix RCU usage in connect path")
Signed-off-by: Jozef Hopko <jozef.hopko@altana.com>
Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
Acked-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://patch.msgid.link/20240701-wilc_fix_ies_data-v1-1-7486cbacf98a@bootlin.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/staging/wilc1000/wilc_hif.c

index 22e02fd068b4d401405de44b8017fb7d7c4bd55d..7f54665c0a0f68079982b2c6b03c180c47260448 100644 (file)
@@ -446,7 +446,8 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss,
        struct ieee80211_p2p_noa_attr noa_attr;
        const struct cfg80211_bss_ies *ies;
        struct wilc_join_bss_param *param;
-       u8 rates_len = 0, ies_len;
+       u8 rates_len = 0;
+       int ies_len;
        int ret;
 
        param = kzalloc(sizeof(*param), GFP_KERNEL);