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

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>

+2 -2
+2 -2
security/integrity/ima/ima_policy.c
··· 68 68 69 69 struct ima_rule_opt_list { 70 70 size_t count; 71 - char *items[]; 71 + char *items[] __counted_by(count); 72 72 }; 73 73 74 74 /* ··· 342 342 kfree(src_copy); 343 343 return ERR_PTR(-ENOMEM); 344 344 } 345 + opt_list->count = count; 345 346 346 347 /* 347 348 * strsep() has already replaced all instances of '|' with '\0', ··· 358 357 opt_list->items[i] = cur; 359 358 cur = strchr(cur, '\0') + 1; 360 359 } 361 - opt_list->count = count; 362 360 363 361 return opt_list; 364 362 }