KVM: Annotate struct kvm_irq_routing_table with __counted_by
authorKees Cook <keescook@chromium.org>
Fri, 22 Sep 2023 17:51:21 +0000 (10:51 -0700)
committerKees Cook <keescook@chromium.org>
Mon, 9 Oct 2023 05:46:04 +0000 (22:46 -0700)
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 kvm_irq_routing_table.

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

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org
Reviewed-by: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20230922175121.work.660-kees@kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
include/linux/kvm_host.h

index fb6c6109fdcad69f81cd38edf52dce7dc3d7a4e9..4944136efaa22c98931252f1d45338ecb5381b06 100644 (file)
@@ -664,7 +664,7 @@ struct kvm_irq_routing_table {
         * Array indexed by gsi. Each entry contains list of irq chips
         * the gsi is connected to.
         */
-       struct hlist_head map[];
+       struct hlist_head map[] __counted_by(nr_rt_entries);
 };
 #endif