From: Kees Cook <keescook@chromium.org>
To: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: Jason Gunthorpe <jgg@ziepe.ca>, Leon Romanovsky <leon@kernel.org>,
linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-hardening@vger.kernel.org
Subject: Re: [PATCH][next] RDMA/uverbs: Avoid -Wflex-array-member-not-at-end warnings
Date: Fri, 1 Mar 2024 16:14:46 -0800 [thread overview]
Message-ID: <202403011613.BB548211F3@keescook> (raw)
In-Reply-To: <ZeIgeZ5Sb0IZTOyt@neat>
On Fri, Mar 01, 2024 at 12:37:45PM -0600, Gustavo A. R. Silva wrote:
> -Wflex-array-member-not-at-end is coming in GCC-14, and we are getting
> ready to enable it globally.
>
> There are currently a couple of objects (`alloc_head` and `bundle`) in
> `struct bundle_priv` that contain a couple of flexible structures:
>
> struct bundle_priv {
> /* Must be first */
> struct bundle_alloc_head alloc_head;
>
> ...
>
> /*
> * Must be last. bundle ends in a flex array which overlaps
> * internal_buffer.
> */
> struct uverbs_attr_bundle bundle;
> u64 internal_buffer[32];
> };
>
> So, in order to avoid ending up with a couple of flexible-array members
> in the middle of a struct, we use the `struct_group_tagged()` helper to
> separate the flexible array from the rest of the members in the flexible
> structures:
>
> struct uverbs_attr_bundle {
> struct_group_tagged(uverbs_attr_bundle_hdr, hdr,
> ... the rest of the members
> );
> struct uverbs_attr attrs[];
> };
>
> With the change described above, we now declare objects of the type of
> the tagged struct without embedding flexible arrays in the middle of
> another struct:
>
> struct bundle_priv {
> /* Must be first */
> struct bundle_alloc_head_hdr alloc_head;
>
> ...
>
> struct uverbs_attr_bundle_hdr bundle;
> u64 internal_buffer[32];
> };
>
> We also use `container_of()` whenever we need to retrieve a pointer
> to the flexible structures.
>
> Notice that the `bundle_size` computed in `uapi_compute_bundle_size()`
> remains the same.
>
> So, with these changes, fix the following warnings:
>
> drivers/infiniband/core/uverbs_ioctl.c:45:34: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
> 45 | struct bundle_alloc_head alloc_head;
> | ^~~~~~~~~~
> drivers/infiniband/core/uverbs_ioctl.c:67:35: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
> 67 | struct uverbs_attr_bundle bundle;
> | ^~~~~~
>
> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
This looks complex, but I think it's simpler that other changes that
would have much more collateral impact. Thanks for figuring out a
workable solution!
Reviewed-by: Kees Cook <keescook@chromium.org>
--
Kees Cook
next prev parent reply other threads:[~2024-03-02 0:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-01 18:37 [PATCH][next] RDMA/uverbs: Avoid -Wflex-array-member-not-at-end warnings Gustavo A. R. Silva
2024-03-02 0:14 ` Kees Cook [this message]
2024-03-03 13:41 ` Leon Romanovsky
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=202403011613.BB548211F3@keescook \
--to=keescook@chromium.org \
--cc=gustavoars@kernel.org \
--cc=jgg@ziepe.ca \
--cc=leon@kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).