Skip to contentSkip to conversation

media: allegro: Annotate struct mcu_msg_push_buffers_internal with __counted_by

PATCH Applied Kees Cook 2 participants 3 messages Sep 22, 2023 – Oct 6, 2023

Subsystems (2)
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

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

Cc Michael Tretter <[email protected]>
Cc Pengutronix Kernel Team <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
---
 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
index a5686058d754..c0c9013f1aab 100644
@@ -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
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Kees Cook

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.

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]>

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
index a5686058d754..c0c9013f1aab 100644
@@ -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 {
author Applied
#2 lore raw
In reply to Kees Cook
Quoted 9 lines · Kees Cook

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.

[...]

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