From: Kees Cook <keescook@chromium.org>
Date: Thu, 17 Aug 2023 20:35:02 +0000 (-0700)
Subject: audit: Annotate struct audit_chunk with __counted_by
X-Git-Tag: v6.7-rc1~167^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=97f576eb38ae219a6fb337d13586d8acbf01d3f8;p=thirdparty%2Fkernel%2Flinux.git

audit: Annotate struct audit_chunk 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 audit_chunk.

[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci

Cc: Paul Moore <paul@paul-moore.com>
Cc: Eric Paris <eparis@redhat.com>
Cc: audit@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Signed-off-by: Paul Moore <paul@paul-moore.com>
---

diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index e867c17d3f84d..85a5b306733b0 100644
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@ -34,7 +34,7 @@ struct audit_chunk {
 		struct list_head list;
 		struct audit_tree *owner;
 		unsigned index;		/* index; upper bit indicates 'will prune' */
-	} owners[];
+	} owners[] __counted_by(count);
 };
 
 struct audit_tree_mark {