From: Kees Cook Date: Thu, 17 Aug 2023 21:03:01 +0000 (-0700) Subject: landlock: Annotate struct landlock_rule with __counted_by X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=246c713a3655c840337c4b24d3838558673c0d6b;p=linux.git landlock: Annotate struct landlock_rule with __counted_by Prepare for the coming implementation by GCC and Clang of the __counted_by attribute. Flexible array members annotated with __counted_by can have their accesses bounds-checked at run-time checking via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions). As found with Coccinelle[1], add __counted_by for struct landlock_rule. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Paul Moore Cc: James Morris Cc: "Serge E. Hallyn" Cc: linux-security-module@vger.kernel.org Signed-off-by: Kees Cook Reviewed-by: Justin Stitt Reviewed-by: "Gustavo A. R. Silva" Link: https://lore.kernel.org/r/20230817210257.never.920-kees@kernel.org Signed-off-by: Mickaël Salaün --- diff --git a/security/landlock/ruleset.h b/security/landlock/ruleset.h index d43231b783e4f..55b1df8f66a8c 100644 --- a/security/landlock/ruleset.h +++ b/security/landlock/ruleset.h @@ -67,7 +67,7 @@ struct landlock_rule { * @layers: Stack of layers, from the latest to the newest, implemented * as a flexible array member (FAM). */ - struct landlock_layer layers[]; + struct landlock_layer layers[] __counted_by(num_layers); }; /**