Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

overflow: Add STACK_FLEX_ARRAY_SIZE() helper

Add new STACK_FLEX_ARRAY_SIZE() helper to get the size of a
flexible-array member defined using DEFINE_FLEX()/DEFINE_RAW_FLEX()
at compile time.

This is essentially the same as ARRAY_SIZE() but for on-stack
flexible-array members.

Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/83d53744e11c80eb3f03765238cbe648855f4168.1745355442.git.gustavoars@kernel.org
Signed-off-by: Kees Cook <kees@kernel.org>

authored by

Gustavo A. R. Silva and committed by
Kees Cook
190faecf ccf1d2b4

+15
+15
include/linux/overflow.h
··· 420 420 * flexible array member. 421 421 * Use __struct_size(@name) to get compile-time size of it afterwards. 422 422 * Use __member_size(@name->member) to get compile-time size of @name members. 423 + * Use STACK_FLEX_ARRAY_SIZE(@name, @member) to get compile-time number of 424 + * elements in array @member. 423 425 */ 424 426 #define DEFINE_RAW_FLEX(type, name, member, count) \ 425 427 _DEFINE_FLEX(type, name, member, count, = {}) ··· 440 438 * flexible array member. 441 439 * Use __struct_size(@NAME) to get compile-time size of it afterwards. 442 440 * Use __member_size(@NAME->member) to get compile-time size of @NAME members. 441 + * Use STACK_FLEX_ARRAY_SIZE(@name, @member) to get compile-time number of 442 + * elements in array @member. 443 443 */ 444 444 #define DEFINE_FLEX(TYPE, NAME, MEMBER, COUNTER, COUNT) \ 445 445 _DEFINE_FLEX(TYPE, NAME, MEMBER, COUNT, = { .obj.COUNTER = COUNT, }) 446 + 447 + /** 448 + * STACK_FLEX_ARRAY_SIZE() - helper macro for DEFINE_FLEX() family. 449 + * Returns the number of elements in @array. 450 + * 451 + * @name: Name for a variable defined in DEFINE_RAW_FLEX()/DEFINE_FLEX(). 452 + * @array: Name of the array member. 453 + */ 454 + #define STACK_FLEX_ARRAY_SIZE(name, array) \ 455 + (__member_size((name)->array) / sizeof(*(name)->array) + \ 456 + __must_be_array((name)->array)) 446 457 447 458 #endif /* __LINUX_OVERFLOW_H */