Skip to contentSkip to conversation

staging: rtl8192e: Annotate struct rtllib_txb with __counted_by

PATCH In review Kees Cook 3 participants 3 messages Aug 17, 2023 – Aug 19, 2023 Staging

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 staging: rtl8192e: Annotate struct rtllib_txb 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 rtllib_txb.

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

Cc Greg Kroah-Hartman <[email protected]>
Cc Philipp Hortmann <[email protected]>
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>
---
 drivers/staging/rtl8192e/rtllib.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8192e/rtllib.h +1 -1
index c5a692dfcd17..543d8671281d 100644
@@ -818,7 +818,7 @@ struct rtllib_txb {
 	u16 reserved;
 	__le16 frag_size;
 	__le16 payload_size;
-	struct sk_buff *fragments[];
+	struct sk_buff *fragments[] __counted_by(nr_frags);
 };
 
 #define MAX_SUBFRAME_COUNT		  64
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 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).

Quoted 8 lines

As found with Coccinelle[1], add __counted_by for struct rtllib_txb.

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

Cc Greg Kroah-Hartman <[email protected]>
Cc Philipp Hortmann <[email protected]>
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>
Reviewed-by Gustavo A. R. Silva <[email protected]>

Thanks
--
Gustavo

Quoted 17 lines
---
  drivers/staging/rtl8192e/rtllib.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8192e/rtllib.h +1 -1
index c5a692dfcd17..543d8671281d 100644
@@ -818,7 +818,7 @@ struct rtllib_txb {
  	u16 reserved;
  	__le16 frag_size;
  	__le16 payload_size;
-	struct sk_buff *fragments[];
+	struct sk_buff *fragments[] __counted_by(nr_frags);
  };
 
  #define MAX_SUBFRAME_COUNT		  64
Tested-by on v1 1/1
#2 lore raw
In reply to Kees Cook
Quoted 23 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 rtllib_txb.

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

Cc Greg Kroah-Hartman <[email protected]>
Cc Philipp Hortmann <[email protected]>
Cc [email protected]
Signed-off-by Kees Cook <[email protected]>
---
  drivers/staging/rtl8192e/rtllib.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8192e/rtllib.h +0 -0
index c5a692dfcd17..543d8671281d 100644

drivers/staging/rtl8192e/rtllib.h struct rtllib_txb { · line 824

Quoted 8 lines
drivers/staging/rtl8192e/rtllib.h +1 -1
@@ -818,7 +818,7 @@ struct rtllib_txb {
  	u16 reserved;
  	__le16 frag_size;
  	__le16 payload_size;
-	struct sk_buff *fragments[];
+	struct sk_buff *fragments[] __counted_by(nr_frags);
  };
 
  #define MAX_SUBFRAME_COUNT		  64
Tested-by Philipp Hortmann <[email protected]>