drm/vc4: Annotate struct vc4_perfmon with __counted_by
authorKees Cook <keescook@chromium.org>
Fri, 22 Sep 2023 17:32:11 +0000 (10:32 -0700)
committerChristian König <christian.koenig@amd.com>
Thu, 5 Oct 2023 09:30:50 +0000 (11:30 +0200)
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 vc4_perfmon.

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

Cc: Emma Anholt <emma@anholt.net>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: David Airlie <airlied@gmail.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230922173216.3823169-6-keescook@chromium.org
drivers/gpu/drm/vc4/vc4_drv.h

index bf66499765fbb82ec3d42b5bb4752371fd5c1eb7..ab61e96e7e14e28acb4b6d1b154fd3b553325e1f 100644 (file)
@@ -76,7 +76,7 @@ struct vc4_perfmon {
         * Note that counter values can't be reset, but you can fake a reset by
         * destroying the perfmon and creating a new one.
         */
-       u64 counters[];
+       u64 counters[] __counted_by(ncounters);
 };
 
 struct vc4_dev {