Skip to contentSkip to conversation

mfd: iqs62x: Annotate struct iqs62x_fw_blk with __counted_by

PATCH Applied Kees Cook 3 participants 3 messages Sep 22, 2023 – Sep 28, 2023 Multifunction devices (MFD)

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 mfd: iqs62x: Annotate struct iqs62x_fw_blk 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 iqs62x_fw_blk.

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

---
 drivers/mfd/iqs62x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/iqs62x.c +1 -1
index e03b4d38fbb0..1b465590567c 100644
@@ -96,7 +96,7 @@ struct iqs62x_fw_blk {
 	u8 addr;
 	u8 mask;
 	u8 len;
-	u8 data[];
+	u8 data[] __counted_by(len);
 };
 
 struct iqs62x_info {
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 6 lines

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

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

Thanks

Signature · 1 line
Gustavo
Quoted 17 lines
---
  drivers/mfd/iqs62x.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/iqs62x.c +1 -1
index e03b4d38fbb0..1b465590567c 100644
@@ -96,7 +96,7 @@ struct iqs62x_fw_blk {
  	u8 addr;
  	u8 mask;
  	u8 len;
-	u8 data[];
+	u8 data[] __counted_by(len);
  };
 
  struct iqs62x_info {
maintainer Applied
#2 lore raw

Re: (subset) [PATCH] mfd: iqs62x: Annotate struct iqs62x_fw_blk with __counted_by

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

[...]

Applied, thanks!

[1/1] mfd: iqs62x: Annotate struct iqs62x_fw_blk with __counted_by

      commit: d25fad59146b4fb24f690bc0bedd32a299bc1541

--
Lee Jones [李琼斯]