Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de046fe8 authored by Jozef Hopko's avatar Jozef Hopko Committed by Greg Kroah-Hartman
Browse files

wifi: wilc1000: fix ies_len type in connect path 



[ 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: default avatarJozef Hopko <jozef.hopko@altana.com>
Signed-off-by: default avatarAlexis Lothoré <alexis.lothore@bootlin.com>
Acked-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://patch.msgid.link/20240701-wilc_fix_ies_data-v1-1-7486cbacf98a@bootlin.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2a2e79db

drivers/staging/wilc1000/wilc_hif.c

+2 −1
Original line number Diff line number Diff line
@@ -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);