Skip to contentSkip to conversation

wifi: p54: Annotate struct p54_cal_database with __counted_by

PATCH In review Kees Cook 3 participants 3 messages Oct 9, 2023 – Oct 12, 2023 P54 wireless driver

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH v2 1/1 wifi: p54: Annotate struct p54_cal_database 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 via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions).

Add __counted_by for struct p54_cal_database.

Cc Christian Lamparter <[email protected]>
Cc Kalle Valo <[email protected]>
Cc "Gustavo A. R. Silva" <[email protected]>
Cc [email protected]
Cc [email protected]
Suggested-by Jason Andryuk <[email protected]>
Signed-off-by Kees Cook <[email protected]>

---
v1 - https://lore.kernel.org/all/[email protected]/
v2 - use the correct member (jandryuk)

---
 drivers/net/wireless/intersil/p54/p54.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intersil/p54/p54.h +1 -1
index 3356ea708d81..522656de4159 100644
@@ -126,7 +126,7 @@ struct p54_cal_database {
 	size_t entry_size;
 	size_t offset;
 	size_t len;
-	u8 data[];
+	u8 data[] __counted_by(len);
 };
 
 #define EEPROM_READBACK_LEN 0x3fc
Signature · 1 line
2.34.1
Reviewed-by on v2 1/1
#1 lore raw
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 via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions).

Add __counted_by for struct p54_cal_database.

Quoted 7 lines
Cc Christian Lamparter <[email protected]>
Cc Kalle Valo <[email protected]>
Cc "Gustavo A. R. Silva" <[email protected]>
Cc [email protected]
Cc [email protected]
Suggested-by Jason Andryuk <[email protected]>
Signed-off-by Kees Cook <[email protected]>
Reviewed-by Jason Andryuk <[email protected]>

Thanks,
Jason

#2 lore raw
In reply to Kees Cook
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 via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions).

Add __counted_by for struct p54_cal_database.

Quoted 8 lines
Cc Christian Lamparter <[email protected]>
Cc Kalle Valo <[email protected]>
Cc "Gustavo A. R. Silva" <[email protected]>
Cc [email protected]
Cc [email protected]
Suggested-by Jason Andryuk <[email protected]>
Signed-off-by Kees Cook <[email protected]>
Reviewed-by Jason Andryuk <[email protected]>

Patch applied to wireless-next.git, thanks.

d9756ce618f3 wifi: p54: Annotate struct p54_cal_database with __counted_by

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches