Received-SPF: pass (google.com: domain of linux-wireless+bounces-7841-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Message-ID: <95f3e147de837b4833e6cf6eb67108f96640af4e.camel@sipsolutions.net>
Subject: Re: [WARNING] memcpy: detected field-spanning write (size 1005) of
 single field "&out_cmd->cmd.payload" at
 drivers/net/wireless/intel/iwlegacy/common.c:3173 (size 320)
From: Johannes Berg <johannes@sipsolutions.net>
To: Stanislaw Gruszka <stf_xl@wp.pl>, Kees Cook <keescook@chromium.org>
Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>, Xose Vazquez Perez
	 <xose.vazquez@gmail.com>, linux-wireless@vger.kernel.org, 
	linux-hardening@vger.kernel.org
Date: Mon, 20 May 2024 13:45:37 +0200
In-Reply-To: <20240520073210.GA693073@wp.pl>
References: <2c534d01-449a-43f4-9216-eacdb3b35577@gmail.com>
	 <20240518092939.GA643846@wp.pl> <202405181033.6399B7E416@keescook>
	 <20240520073210.GA693073@wp.pl>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.50.4 (3.50.4-1.fc39) 
Precedence: bulk
MIME-Version: 1.0


> +++ b/drivers/net/wireless/intel/iwlegacy/commands.h
> @@ -201,9 +201,6 @@ struct il_cmd_header {
>  	 *  15          unsolicited RX or uCode-originated notification
>  	 */
>  	__le16 sequence;
> -
> -	/* command or response/notification data follows immediately */
> -	u8 data[];
>  } __packed;

[...]


> -	memcpy(&out_cmd->cmd.payload, cmd->data, cmd->len);
> +	memcpy(&out_cmd->cmd.raw, cmd->data, cmd->len);

[...]

> +++ b/drivers/net/wireless/intel/iwlegacy/common.h
> @@ -555,6 +555,7 @@ struct il_device_cmd {
>  		u32 val32;
>  		struct il_tx_cmd tx;
>  		u8 payload[DEF_CMD_PAYLOAD_SIZE];
> +		DECLARE_FLEX_ARRAY(u8, raw);
>=20

I don't think this is right, now the raw comes after
DEF_CMD_PAYLOAD_SIZE? You want it to be a union with payload, I'd think.

johannes