Unverified Commit 38921c2c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

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

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/P3QNCX4MKZBWHOEQ7VWJQBRD7WPXSH6N/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYRBC 
 
Link:https://gitee.com/openeuler/kernel/pulls/13022

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 0298d455 89fe5f71

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

+1 −1
Original line number Diff line number Diff line
@@ -1593,7 +1593,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
@@ -2561,8 +2561,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);