From: "Gustavo A. R. Silva" <gustavoars@kernel.org>
To: Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>
Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
linux-hardening@vger.kernel.org
Subject: [PATCH][next] crypto: drbg - Avoid -Wflex-array-member-not-at-end warning
Date: Mon, 10 Nov 2025 19:44:56 +0900 [thread overview]
Message-ID: <aRHCKMGDbWkXIY8f@kspp> (raw)
-Wflex-array-member-not-at-end was introduced in GCC-14, and we are
getting ready to enable it, globally.
Use the new TRAILING_OVERLAP() helper to fix the following warning:
crypto/drbg.c:1445:27: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
This helper creates a union between a flexible-array member (FAM) and a
set of MEMBERS that would otherwise follow it.
This overlays the trailing MEMBER char ctx[]; onto the FAM struct
shash_desc::__ctx,[] while keeping the FAM and the start of MEMBER
aligned.
The static_assert() ensures this alignment remains, and it's
intentionally placed inmediately after the corresponding structures --no
blank line in between.
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
---
crypto/drbg.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/crypto/drbg.c b/crypto/drbg.c
index 511a27c91813..e9f9775c237f 100644
--- a/crypto/drbg.c
+++ b/crypto/drbg.c
@@ -1442,9 +1442,12 @@ static void drbg_kcapi_set_entropy(struct crypto_rng *tfm,
#if defined(CONFIG_CRYPTO_DRBG_HASH) || defined(CONFIG_CRYPTO_DRBG_HMAC)
struct sdesc {
- struct shash_desc shash;
- char ctx[];
+ /* Must be last as it ends in a flexible-array member. */
+ TRAILING_OVERLAP(struct shash_desc, shash, __ctx,
+ char ctx[];
+ );
};
+static_assert(offsetof(struct sdesc, shash.__ctx) == offsetof(struct sdesc, ctx));
static int drbg_init_hash_kernel(struct drbg_state *drbg)
{
--
2.43.0
next reply other threads:[~2025-11-10 10:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-10 10:44 Gustavo A. R. Silva [this message]
2025-11-19 4:38 ` [v2 PATCH] crypto: drbg - Delete unused ctx from struct sdesc Herbert Xu
2025-11-19 4:47 ` Gustavo A. R. Silva
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=aRHCKMGDbWkXIY8f@kspp \
--to=gustavoars@kernel.org \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@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 NNTP newsgroup(s).