media: allegro: Annotate struct mcu_msg_push_buffers_internal with __counted_by
Subsystems (2)
PATCH 1/1 media: allegro: Annotate struct mcu_msg_push_buffers_internal 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 mcu_msg_push_buffers_internal.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
--- drivers/media/platform/allegro-dvt/allegro-mail.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/allegro-dvt/allegro-mail.h +1 -1
@@ -184,7 +184,7 @@ struct mcu_msg_push_buffers_internal {struct mcu_msg_header header;u32 channel_id;size_t num_buffers; -struct mcu_msg_push_buffers_internal_buffer buffer[]; + struct mcu_msg_push_buffers_internal_buffer buffer[] __counted_by(num_buffers); };struct mcu_msg_put_stream_buffer {
Signature · 1 line
2.34.1
Quoted 8 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 structmcu_msg_push_buffers_internal.
Quoted 7 lines
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc Michael Tretter <[email protected]>Cc Pengutronix Kernel Team <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>Signed-off-by Kees Cook <[email protected]>
Thanks
Signature · 1 line
Gustavo
Quoted 17 lines
--- drivers/media/platform/allegro-dvt/allegro-mail.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/media/platform/allegro-dvt/allegro-mail.h +1
-1@@ -184,7 +184,7 @@ struct mcu_msg_push_buffers_internal {struct mcu_msg_header header;u32 channel_id;size_t num_buffers; -struct mcu_msg_push_buffers_internal_buffer buffer[]; + struct mcu_msg_push_buffers_internal_buffer buffer[] __counted_by(num_buffers); };struct mcu_msg_put_stream_buffer {
Kees Cook
AppliedQuoted 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 structmcu_msg_push_buffers_internal.[...]
Since this is a trivial change and it's been 2 week without further discussion, I'll snag this patch.
Applied to for-next/hardening, thanks!
[1/1] media: allegro: Annotate struct mcu_msg_push_buffers_internal with __counted_by
https://git.kernel.org/kees/c/63eed8dcdf49
Take care,
Signature · 1 line
Kees Cook