LoadPin: Annotate struct dm_verity_loadpin_trusted_root_digest with __counted_by
authorKees Cook <keescook@chromium.org>
Thu, 17 Aug 2023 23:59:56 +0000 (16:59 -0700)
committerKees Cook <keescook@chromium.org>
Fri, 25 Aug 2023 23:07:30 +0000 (16:07 -0700)
commit5f536ac6a5a7b67351e4e5ae4f9e1e57d31268e6
treeed211e9dde27ef90f078f58cbd6d717dc2a5d0b9
parent76903a9648744c081547c91f31ec3917204b74e5
LoadPin: Annotate struct dm_verity_loadpin_trusted_root_digest 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 dm_verity_loadpin_trusted_root_digest.
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: Alasdair Kergon <agk@redhat.com>
Cc: Mike Snitzer <snitzer@kernel.org>
Cc: dm-devel@redhat.com
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
Link: https://lore.kernel.org/r/20230817235955.never.762-kees@kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
include/linux/dm-verity-loadpin.h
security/loadpin/loadpin.c