From: Kalle Valo <kvalo@kernel.org>
To: Kees Cook <keescook@chromium.org>
Cc: Kees Cook <keescook@chromium.org>,
Geert Uytterhoeven <geert@linux-m68k.org>,
linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-hardening@vger.kernel.org
Subject: Re: [PATCH] wifi: ray_cs: Replace 1-element array with flexible array
Date: Tue, 1 Aug 2023 13:41:18 +0000 (UTC) [thread overview]
Message-ID: <169089727636.39272.16037953063224759518.kvalo@kernel.org> (raw)
In-Reply-To: <20230728231245.never.309-kees@kernel.org>
Kees Cook <keescook@chromium.org> wrote:
> The trailing array member of struct tx_buf was defined as a 1-element
> array, but used as a flexible array. This was resulting in build warnings:
>
> In function 'fortify_memset_chk',
> inlined from 'memset_io' at /kisskb/src/arch/mips/include/asm/io.h:486:2,
> inlined from 'build_auth_frame' at /kisskb/src/drivers/net/wireless/legacy/ray_cs.c:2697:2:
> /kisskb/src/include/linux/fortify-string.h:493:25: error: call to '__write_overflow_field' declared with attribute warning:
> detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
> 493 | __write_overflow_field(p_size_field, size);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Replace it with an actual flexible array. Binary difference comparison
> shows a single change in output:
>
> │ drivers/net/wireless/legacy/ray_cs.c:883
> │ lea 0x1c(%rbp),%r13d
> │ - cmp $0x7c3,%r13d
> │ + cmp $0x7c4,%r13d
>
> This is from:
>
> if (len + TX_HEADER_LENGTH > TX_BUF_SIZE) {
>
> specifically:
>
> #define TX_BUF_SIZE (2048 - sizeof(struct tx_msg))
>
> This appears to have been originally buggy, so the change is correct.
>
> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Closes: https://lore.kernel.org/all/88f83d73-781d-bdc-126-aa629cb368c@linux-m68k.org
> Cc: Kalle Valo <kvalo@kernel.org>
> Cc: linux-wireless@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Patch applied to wireless.git, thanks.
1d7dd5aa3547 wifi: ray_cs: Replace 1-element array with flexible array
--
https://patchwork.kernel.org/project/linux-wireless/patch/20230728231245.never.309-kees@kernel.org/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
prev parent reply other threads:[~2023-08-01 13:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-28 23:13 Kees Cook
2023-08-01 13:41 ` Kalle Valo [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=169089727636.39272.16037953063224759518.kvalo@kernel.org \
--to=kvalo@kernel.org \
--cc=geert@linux-m68k.org \
--cc=keescook@chromium.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®