Skip to contentSkip to conversation

i3c/master/mipi-i3c-hci: Annotate struct hci_rings_data with __counted_by

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

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 i3c/master/mipi-i3c-hci: Annotate struct hci_rings_data 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 hci_rings_data.

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

Cc Alexandre Belloni <[email protected]>
Cc Nicolas Pitre <[email protected]>
Cc Len Baker <[email protected]>
Cc Boris Brezillon <[email protected]>
---
 drivers/i3c/master/mipi-i3c-hci/dma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i3c/master/mipi-i3c-hci/dma.c +1 -1
index 2990ac9eaade..a1ecdfc35641 100644
@@ -139,7 +139,7 @@ struct hci_rh_data {
 
 struct hci_rings_data {
 	unsigned int total;
-	struct hci_rh_data headers[];
+	struct hci_rh_data headers[] __counted_by(total);
 };
 
 struct hci_dma_dev_ibi_data {
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 hci_rings_data.

Quoted 8 lines

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

Cc Alexandre Belloni <[email protected]>
Cc Nicolas Pitre <[email protected]>
Cc Len Baker <[email protected]>
Cc Boris Brezillon <[email protected]>

Thanks

Signature · 1 line
Gustavo
Quoted 17 lines
---
  drivers/i3c/master/mipi-i3c-hci/dma.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i3c/master/mipi-i3c-hci/dma.c +1 -1
index 2990ac9eaade..a1ecdfc35641 100644
@@ -139,7 +139,7 @@ struct hci_rh_data {
 
  struct hci_rings_data {
  	unsigned int total;
-	struct hci_rh_data headers[];
+	struct hci_rh_data headers[] __counted_by(total);
  };
 
  struct hci_dma_dev_ibi_data {
maintainer 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 hci_rings_data.

[...]

Applied, thanks!

[1/1] i3c/master/mipi-i3c-hci: Annotate struct hci_rings_data with __counted_by

      commit: 751d377f0f7a09d6122de0e2232133524568c52b

Best regards,

Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com