From: Kees Cook <keescook@chromium.org>
To: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Len Brown <lenb@kernel.org>,
Robert Moore <robert.moore@intel.com>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
linux-acpi@vger.kernel.org, devel@acpica.org,
linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org
Subject: Re: [PATCH] ACPICA: Replace fake flexible arrays with flexible array members
Date: Sun, 15 Jan 2023 10:38:48 -0800 [thread overview]
Message-ID: <202301151037.20CC3F0@keescook> (raw)
In-Reply-To: <20221118181538.never.225-kees@kernel.org>
On Fri, Nov 18, 2022 at 10:15:51AM -0800, Kees Cook wrote:
> Functionally identical to ACPICA upstream pull request 813:
> https://github.com/acpica/acpica/pull/813
Any update on this? Upstream is currently unbuildable since October.
> One-element arrays (and multi-element arrays being treated as
> dynamically sized) are deprecated[1] and are being replaced with
> flexible array members in support of the ongoing efforts to tighten the
> FORTIFY_SOURCE routines on memcpy(), correctly instrument array indexing
> with UBSAN_BOUNDS, and to globally enable -fstrict-flex-arrays=3.
>
> Replace one-element array with flexible-array member in struct
> acpi_resource_extended_irq. Replace 4-byte fixed-size array with 4-byte
> padding in a union with a flexible-array member in struct
> acpi_pci_routing_table.
>
> This results in no differences in binary output.
In the meantime, can you take this patch for Linux, and we can wait for
ACPICA to catch up?
Thanks!
-Kees
>
> Cc: "Rafael J. Wysocki" <rafael@kernel.org>
> Cc: Len Brown <lenb@kernel.org>
> Cc: Robert Moore <robert.moore@intel.com>
> Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
> Cc: linux-acpi@vger.kernel.org
> Cc: devel@acpica.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> include/acpi/acrestyp.h | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/include/acpi/acrestyp.h b/include/acpi/acrestyp.h
> index a7fb8ddb3dc6..ee945084d46e 100644
> --- a/include/acpi/acrestyp.h
> +++ b/include/acpi/acrestyp.h
> @@ -332,7 +332,7 @@ struct acpi_resource_extended_irq {
> u8 wake_capable;
> u8 interrupt_count;
> struct acpi_resource_source resource_source;
> - u32 interrupts[1];
> + u32 interrupts[];
> };
>
> struct acpi_resource_generic_register {
> @@ -679,7 +679,10 @@ struct acpi_pci_routing_table {
> u32 pin;
> u64 address; /* here for 64-bit alignment */
> u32 source_index;
> - char source[4]; /* pad to 64 bits so sizeof() works in all cases */
> + union {
> + char pad[4]; /* pad to 64 bits so sizeof() works in all cases */
> + DECLARE_FLEX_ARRAY(char, source);
> + };
> };
>
> #endif /* __ACRESTYP_H__ */
> --
> 2.34.1
>
--
Kees Cook
next prev parent reply other threads:[~2023-01-15 18:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-18 18:15 [PATCH] ACPICA: Replace fake flexible arrays with flexible array members Kees Cook
2023-01-15 18:38 ` Kees Cook [this message]
2023-01-20 18:10 ` Rafael J. Wysocki
2023-01-20 19:16 ` Kees Cook
2023-01-27 18:08 ` Rafael J. Wysocki
2023-01-27 18:33 ` Kees Cook
2023-01-27 18:52 ` Rafael J. Wysocki
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=202301151037.20CC3F0@keescook \
--to=keescook@chromium.org \
--cc=devel@acpica.org \
--cc=gustavoars@kernel.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=robert.moore@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).