Commit a26c23e0 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Herbert Xu
Browse files

KEYS: Avoid -Wflex-array-member-not-at-end warning 



-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/asymmetric_keys/restrict.c:20:34: 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 unsigned char data[10]; onto the FAM
struct asymmetric_key_id::data[], 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: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: default avatarIgnat Korchagin <ignat@cloudflare.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 8700ce07

crypto/asymmetric_keys/restrict.c

+5 −2
Original line number Diff line number Diff line
@@ -17,9 +17,12 @@ static struct asymmetric_key_id *ca_keyid; 


#ifndef MODULE

static struct {

	struct asymmetric_key_id id;

	/* Must be last as it ends in a flexible-array member. */

	TRAILING_OVERLAP(struct asymmetric_key_id, id, data,

		unsigned char data[10];

	);

} cakey;

static_assert(offsetof(typeof(cakey), id.data) == offsetof(typeof(cakey), data));



static int __init ca_keys_setup(char *str)

{