]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm/vmwgfx: Annotate struct vmw_surface_dirty with __counted_by
authorKees Cook <keescook@chromium.org>
Fri, 22 Sep 2023 17:32:13 +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 vmw_surface_dirty.

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

Cc: Zack Rusin <zackr@vmware.com>
Cc: VMware Graphics Reviewers <linux-graphics-maintainer@vmware.com>
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: Zack Rusin <zackr@vmware.com>
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-8-keescook@chromium.org
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c

index 5db403ee8261d38dae1477ac414c70c7b3ff689a..2d1d857f99ae42e6a365032793d061ae6cd1c611 100644 (file)
@@ -77,7 +77,7 @@ struct vmw_surface_offset {
 struct vmw_surface_dirty {
        struct vmw_surface_cache cache;
        u32 num_subres;
-       SVGA3dBox boxes[];
+       SVGA3dBox boxes[] __counted_by(num_subres);
 };
 
 static void vmw_user_surface_free(struct vmw_resource *res);