integrity: Annotate struct ima_rule_opt_list with __counted_by
authorKees Cook <keescook@chromium.org>
Thu, 17 Aug 2023 21:03:28 +0000 (14:03 -0700)
committerKees Cook <keescook@chromium.org>
Fri, 18 Aug 2023 17:17:07 +0000 (10:17 -0700)
commita4b35d4d05b9f2e84c1dd6301d3dca65719334ef
tree8d1a6e7d740e86686fa0c166f6e32f7fbd9b086d
parent5d207e83ca41206e75c2cd414d40b451ef04c259
integrity: Annotate struct ima_rule_opt_list 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 ima_rule_opt_list.
Additionally, since the element count member must be set before accessing
the annotated flexible array member, move its initialization earlier.

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

Cc: Mimi Zohar <zohar@linux.ibm.com>
Cc: Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
Cc: Paul Moore <paul@paul-moore.com>
Cc: James Morris <jmorris@namei.org>
Cc: "Serge E. Hallyn" <serge@hallyn.com>
Cc: linux-integrity@vger.kernel.org
Cc: linux-security-module@vger.kernel.org
Acked-by: Mimi Zohar <zohar@linux.ibm.com>
Reviewed-by: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Acked-by: Jarkko Sakkinen <jarkko@kernel.org>
Link: https://lore.kernel.org/r/20230817210327.never.598-kees@kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
security/integrity/ima/ima_policy.c