Skip to contentSkip to conversation

crypto: nx - Use static_assert() to check struct sizes

PATCH In review Gustavo A. R. Silva 2 participants 2 messages Aug 8, 2024 – Aug 17, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 crypto: nx - Use static_assert() to check struct sizes

Commit 1e6b251ce175 ("crypto: nx - Avoid -Wflex-array-member-not-at-end warning") introduced tagged struct nx842_crypto_header_hdr. We want to ensure that when new members need to be added to the flexible structure, they are always included within this tagged struct.

So, we use static_assert() to ensure that the memory layout for both the flexible structure and the tagged struct is the same after any changes.

---
 drivers/crypto/nx/nx-842.h | 3 +++
 1 file changed, 3 insertions(+)
drivers/crypto/nx/nx-842.h +3 -0
index 25fa70b2112c..887d4ce3cb49 100644
@@ -157,6 +157,7 @@ struct nx842_crypto_header_group {
 } __packed;
 
 struct nx842_crypto_header {
+	/* New members MUST be added within the struct_group() macro below. */
 	struct_group_tagged(nx842_crypto_header_hdr, hdr,
 		__be16 magic;		/* NX842_CRYPTO_MAGIC */
 		__be16 ignore;		/* decompressed end bytes to ignore */
@@ -164,6 +165,8 @@ struct nx842_crypto_header {
 	);
 	struct nx842_crypto_header_group group[];
 } __packed;
+static_assert(offsetof(struct nx842_crypto_header, group) == sizeof(struct nx842_crypto_header_hdr),
+	      "struct member likely outside of struct_group_tagged()");
 
 #define NX842_CRYPTO_GROUP_MAX	(0x20)
 
Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 5 lines · Gustavo A. R. Silva

Commit 1e6b251ce175 ("crypto: nx - Avoid -Wflex-array-member-not-at-end warning") introduced tagged struct nx842_crypto_header_hdr. We want to ensure that when new members need to be added to the flexible structure, they are always included within this tagged struct.

Quoted 8 lines

So, we use static_assert() to ensure that the memory layout for both the flexible structure and the tagged struct is the same after any changes.

---
 drivers/crypto/nx/nx-842.h | 3 +++
 1 file changed, 3 insertions(+)

Patch applied. Thanks.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt