Skip to contentSkip to conversation

platform/chrome: wilco_ec: Annotate struct ec_event_queue with __counted_by

PATCH Applied Kees Cook 3 participants 4 messages Sep 22, 2023 – Sep 25, 2023

Subsystems (2)
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 platform/chrome: wilco_ec: Annotate struct ec_event_queue 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 ec_event_queue.

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

Cc Benson Leung <[email protected]>
Cc Tzung-Bi Shih <[email protected]>
Cc Dawei Li <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Maximilian Luz <[email protected]>
Cc "Uwe Kleine-König" <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Jiang Jian <[email protected]>
---
 drivers/platform/chrome/wilco_ec/event.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/chrome/wilco_ec/event.c +1 -1
index a40f60bcefb6..f80a7c83cfba 100644
@@ -95,7 +95,7 @@ struct ec_event_queue {
 	int capacity;
 	int head;
 	int tail;
-	struct ec_event *entries[];
+	struct ec_event *entries[] __counted_by(capacity);
 };
 
 /* Maximum number of events to store in ec_event_queue */
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 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 ec_event_queue.

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

Quoted 10 lines
Cc Benson Leung <[email protected]>
Cc Tzung-Bi Shih <[email protected]>
Cc Dawei Li <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Maximilian Luz <[email protected]>
Cc "Uwe Kleine-König" <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Jiang Jian <[email protected]>

Thanks

Signature · 1 line
Gustavo
Quoted 17 lines
---
  drivers/platform/chrome/wilco_ec/event.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/chrome/wilco_ec/event.c +1 -1
index a40f60bcefb6..f80a7c83cfba 100644
@@ -95,7 +95,7 @@ struct ec_event_queue {
  	int capacity;
  	int head;
  	int tail;
-	struct ec_event *entries[];
+	struct ec_event *entries[] __counted_by(capacity);
  };
 
  /* Maximum number of events to store in ec_event_queue */
#2 lore raw
In reply to Kees Cook
This patch was applied to chrome-platform/linux.git (for-kernelci) by Tzung-Bi Shih <[email protected]>:

Hello:

This patch was applied to chrome-platform/linux.git (for-kernelci) by Tzung-Bi Shih <[email protected]>:

Quoted 9 lines · On Fri, 22 Sep 2023 10:51:47 -0700 you wrote:

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

[...]

Here is the summary with links:
- platform/chrome: wilco_ec: Annotate struct ec_event_queue with __counted_by

    https://git.kernel.org/chrome-platform/c/1aa8df90f456

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
#3 lore raw
In reply to Kees Cook
This patch was applied to chrome-platform/linux.git (for-next) by Tzung-Bi Shih <[email protected]>:

Hello:

This patch was applied to chrome-platform/linux.git (for-next) by Tzung-Bi Shih <[email protected]>:

Quoted 9 lines · On Fri, 22 Sep 2023 10:51:47 -0700 you wrote:

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

[...]

Here is the summary with links:
- platform/chrome: wilco_ec: Annotate struct ec_event_queue with __counted_by

    https://git.kernel.org/chrome-platform/c/1aa8df90f456

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html