Skip to content

Commit 246c713

Browse files
keesl0kod
authored andcommitted
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 <paul@paul-moore.com> Cc: James Morris <jmorris@namei.org> Cc: "Serge E. Hallyn" <serge@hallyn.com> Cc: linux-security-module@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> Reviewed-by: Justin Stitt <justinstitt@google.com> Reviewed-by: "Gustavo A. R. Silva" <gustavoars@kernel.org> Link: https://lore.kernel.org/r/20230817210257.never.920-kees@kernel.org Signed-off-by: Mickaël Salaün <mic@digikod.net>
1 parent 2ccdd1b commit 246c713

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

security/landlock/ruleset.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ struct landlock_rule {
6767
* @layers: Stack of layers, from the latest to the newest, implemented
6868
* as a flexible array member (FAM).
6969
*/
70-
struct landlock_layer layers[];
70+
struct landlock_layer layers[] __counted_by(num_layers);
7171
};
7272

7373
/**

0 commit comments

Comments
 (0)