Received-SPF: pass (google.com: domain of linux-wireless+bounces-7845-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Mon, 20 May 2024 17:08:57 +0200
From: Stanislaw Gruszka <stf_xl@wp.pl>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: Kees Cook <keescook@chromium.org>,
	"Gustavo A. R. Silva" <gustavoars@kernel.org>,
	Xose Vazquez Perez <xose.vazquez@gmail.com>,
	linux-wireless@vger.kernel.org, linux-hardening@vger.kernel.org
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)
Message-ID: <20240520150857.GA709412@wp.pl>
References: <2c534d01-449a-43f4-9216-eacdb3b35577@gmail.com>
 <20240518092939.GA643846@wp.pl>
 <202405181033.6399B7E416@keescook>
 <20240520073210.GA693073@wp.pl>
 <95f3e147de837b4833e6cf6eb67108f96640af4e.camel@sipsolutions.net>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <95f3e147de837b4833e6cf6eb67108f96640af4e.camel@sipsolutions.net>

On Mon, May 20, 2024 at 01:45:37PM +0200, Johannes Berg wrote:
> 
> > +++ 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);
> > 
> 
> 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.

Not sure if I understand. I think we have union with payload with 
the patch. The structure looks like this:

struct il_device_cmd {
	struct il_cmd_header hdr;	/* uCode API */
	union {
		u32 flags;
		u8 val8;
		u16 val16;
		u32 val32;
		struct il_tx_cmd tx;
		u8 payload[DEF_CMD_PAYLOAD_SIZE];
		DECLARE_FLEX_ARRAY(u8, raw);
	} __packed cmd;
} __packed;

BTW, the first four cmd union fields i.e. flags, val8 ...
can be removed as well, seems nothing touch those fields in the code.

Regards
Stanislaw