accel/ivpu: Annotate struct ivpu_job with __counted_by
PATCH 1/1 accel/ivpu: Annotate struct ivpu_job 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 ivpu_job.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
--- drivers/accel/ivpu/ivpu_job.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/accel/ivpu/ivpu_job.h +1 -1
@@ -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);
Signature · 1 line
2.34.1
Quoted 10 lines · Kees Cook
Prepare for the coming implementation by GCC and Clang of the
__counted_byattribute. Flexible array members annotated with__counted_bycan have their accesses bounds-checked at run-time checking viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).As found with Coccinelle[1], add
__counted_byfor structivpu_job.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Quoted 9 lines
Cc Jacek Lawrynowicz <[email protected]>Cc Stanislaw Gruszka <[email protected]>Cc Oded Gabbay <[email protected]>Cc Nathan Chancellor <[email protected]>Cc Nick Desaulniers <[email protected]>Cc Tom Rix <[email protected]>Signed-off-by Kees Cook <[email protected]>
Please apply the patch via whatever tree is appropriate. Or if I have to take it via drm-misc, please let me know.
Regards
Stanislaw
Quoted 20 lines
--- drivers/accel/ivpu/ivpu_job.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/accel/ivpu/ivpu_job.h +1
-1@@ -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);Signature · 1 line
2.34.1
Quoted 9 lines · Kees Cook
Prepare for the coming implementation by GCC and Clang of the
__counted_byattribute. Flexible array members annotated with__counted_bycan have their accesses bounds-checked at run-time checking viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).As found with Coccinelle[1], add
__counted_byfor structivpu_job.[...]
Thanks Stanislaw! I'll take it through my for-next/hardening tree then:
[1/1] accel/ivpu: Annotate struct ivpu_job with __counted_by
https://git.kernel.org/kees/c/2eabbbb8275b
Take care,
Signature · 1 line
Kees Cook