[PATCH] accel/ivpu: Annotate struct ivpu_job with __counted_by

Kees Cook keescook at chromium.org
Fri Sep 22 17:54:17 UTC 2023


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 ivpu_job.

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

Cc: Jacek Lawrynowicz <jacek.lawrynowicz at linux.intel.com>
Cc: Stanislaw Gruszka <stanislaw.gruszka at linux.intel.com>
Cc: Oded Gabbay <ogabbay at kernel.org>
Cc: Nathan Chancellor <nathan at kernel.org>
Cc: Nick Desaulniers <ndesaulniers at google.com>
Cc: Tom Rix <trix at redhat.com>
Cc: dri-devel at lists.freedesktop.org
Cc: llvm at lists.linux.dev
Signed-off-by: Kees Cook <keescook at chromium.org>
---
 drivers/accel/ivpu/ivpu_job.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/accel/ivpu/ivpu_job.h b/drivers/accel/ivpu/ivpu_job.h
index aa1f0b9479b0..5514c2d8a609 100644
--- a/drivers/accel/ivpu/ivpu_job.h
+++ b/drivers/accel/ivpu/ivpu_job.h
@@ -51,7 +51,7 @@ struct ivpu_job {
 	u32 job_id;
 	u32 engine_idx;
 	size_t bo_count;
-	struct ivpu_bo *bos[];
+	struct ivpu_bo *bos[] __counted_by(bo_count);
 };
 
 int ivpu_submit_ioctl(struct drm_device *dev, void *data, struct drm_file *file);
-- 
2.34.1



More information about the dri-devel mailing list