Skip to contentSkip to conversation

memstick: jmb38x_ms: Annotate struct jmb38x_ms with __counted_by

PATCH In review Kees Cook 2 participants 2 messages Sep 22, 2023 – Sep 26, 2023

Subsystems (2)
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 memstick: jmb38x_ms: Annotate struct jmb38x_ms 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 jmb38x_ms.

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

Cc Maxim Levitsky <[email protected]>
Cc Alex Dubov <[email protected]>
Cc Ulf Hansson <[email protected]>
Cc Tom Rix <[email protected]>
Cc Len Baker <[email protected]>
Cc Dan Carpenter <[email protected]>
Cc "Gustavo A. R. Silva" <[email protected]>
---
 drivers/memstick/host/jmb38x_ms.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/memstick/host/jmb38x_ms.c +1 -1
index 21cb2a786058..e77eb8b0eb12 100644
@@ -66,7 +66,7 @@ struct jmb38x_ms_host {
 struct jmb38x_ms {
 	struct pci_dev        *pdev;
 	int                   host_cnt;
-	struct memstick_host  *hosts[];
+	struct memstick_host  *hosts[] __counted_by(host_cnt);
 };
 
 #define BLOCK_COUNT_MASK       0xffff0000
Signature · 1 line
2.34.1
#1 lore raw
Quoted 11 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 jmb38x_ms.

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

Quoted 9 lines
Cc Maxim Levitsky <[email protected]>
Cc Alex Dubov <[email protected]>
Cc Ulf Hansson <[email protected]>
Cc Tom Rix <[email protected]>
Cc Len Baker <[email protected]>
Cc Dan Carpenter <[email protected]>
Cc "Gustavo A. R. Silva" <[email protected]>

Applied for next, thanks!

Kind regards
Uffe

Quoted 20 lines
---
 drivers/memstick/host/jmb38x_ms.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/memstick/host/jmb38x_ms.c +1 -2
index 21cb2a786058..e77eb8b0eb12 100644
@@ -66,7 +66,7 @@ struct jmb38x_ms_host {
 struct jmb38x_ms {
        struct pci_dev        *pdev;
        int                   host_cnt;
-       struct memstick_host  *hosts[];
+       struct memstick_host  *hosts[] __counted_by(host_cnt);
 };
 
 #define BLOCK_COUNT_MASK       0xffff0000
--

2.34.1