Commit cb0a1fb7 authored by Kees Cook's avatar Kees Cook Committed by Luca Coelho
Browse files

iwlwifi: dbg_ini: Split memcpy() to avoid multi-field write 



To avoid a run-time false positive in the stricter FORTIFY_SOURCE
memcpy() checks, split the memcpy() into the struct and the data.
Additionally switch the data member to a flexible array to follow
modern language conventions.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20210727205855.411487-64-keescook@chromium.org


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 583d1833

drivers/net/wireless/intel/iwlwifi/fw/file.h

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ enum iwl_ucode_tlv_type { 
struct iwl_ucode_tlv {

	__le32 type;		/* see above */

	__le32 length;		/* not including type/length fields */

	u8 data[0];

	u8 data[];

};



#define IWL_TLV_UCODE_MAGIC		0x0a4c5749

drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c

+2 −1
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ static int iwl_dbg_tlv_add(const struct iwl_ucode_tlv *tlv, 
	if (!node)

		return -ENOMEM;



	memcpy(&node->tlv, tlv, sizeof(node->tlv) + len);

	memcpy(&node->tlv, tlv, sizeof(node->tlv));

	memcpy(node->tlv.data, tlv->data, len);

	list_add_tail(&node->list, list);



	return 0;