Commit 43ff3060 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Liu Jian
Browse files

wifi: mwifiex: Fix memcpy() field-spanning write warning in mwifiex_cmd_802_11_scan_ext() 

stable inclusion
from stable-v6.6.55
commit fef7b51f22cf2049b0ca6740adeb0ba6f2e671dc
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAYRBC
CVE: CVE-2024-50008

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=fef7b51f22cf2049b0ca6740adeb0ba6f2e671dc



-------------------------------------------------

[ Upstream commit 498365e52bebcbc36a93279fe7e9d6aec8479cee ]

Replace one-element array with a flexible-array member in
`struct host_cmd_ds_802_11_scan_ext`.

With this, fix the following warning:

elo 16 17:51:58 surfacebook kernel: ------------[ cut here ]------------
elo 16 17:51:58 surfacebook kernel: memcpy: detected field-spanning write (size 243) of single field "ext_scan->tlv_buffer" at drivers/net/wireless/marvell/mwifiex/scan.c:2239 (size 1)
elo 16 17:51:58 surfacebook kernel: WARNING: CPU: 0 PID: 498 at drivers/net/wireless/marvell/mwifiex/scan.c:2239 mwifiex_cmd_802_11_scan_ext+0x83/0x90 [mwifiex]

Reported-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Closes: https://lore.kernel.org/linux-hardening/ZsZNgfnEwOcPdCly@black.fi.intel.com/


Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://patch.msgid.link/ZsZa5xRcsLq9D+RX@elsanto


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarLiu Jian <liujian56@huawei.com>
parent b2ae42b4

drivers/net/wireless/marvell/mwifiex/fw.h

+1 −1
Original line number Diff line number Diff line
@@ -1587,7 +1587,7 @@ struct host_cmd_ds_802_11_scan_rsp { 


struct host_cmd_ds_802_11_scan_ext {

	u32   reserved;

	u8    tlv_buffer[1];

	u8    tlv_buffer[];

} __packed;



struct mwifiex_ie_types_bss_mode {

drivers/net/wireless/marvell/mwifiex/scan.c

+1 −2
Original line number Diff line number Diff line
@@ -2543,8 +2543,7 @@ int mwifiex_ret_802_11_scan_ext(struct mwifiex_private *priv, 
	ext_scan_resp = &resp->params.ext_scan;



	tlv = (void *)ext_scan_resp->tlv_buffer;

	buf_left = le16_to_cpu(resp->size) - (sizeof(*ext_scan_resp) + S_DS_GEN

					      - 1);

	buf_left = le16_to_cpu(resp->size) - (sizeof(*ext_scan_resp) + S_DS_GEN);



	while (buf_left >= sizeof(struct mwifiex_ie_types_header)) {

		type = le16_to_cpu(tlv->type);