Skip to contentSkip to conversation

hwmon: Annotate struct gsc_hwmon_platform_data with __counted_by

PATCH Applied Kees Cook 2 participants 3 messages Sep 22, 2023 – Oct 6, 2023 Gateworks system controller (gsc) driver

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 hwmon: Annotate struct gsc_hwmon_platform_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 gsc_hwmon_platform_data.

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

Cc Tim Harvey <[email protected]>
Signed-off-by Kees Cook <[email protected]>
---
 include/linux/platform_data/gsc_hwmon.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/platform_data/gsc_hwmon.h +1 -1
index f2781aa7eff8..70e8a6bec0f6 100644
@@ -40,6 +40,6 @@ struct gsc_hwmon_platform_data {
 	unsigned int resolution;
 	unsigned int vreference;
 	unsigned int fan_base;
-	struct gsc_hwmon_channel channels[];
+	struct gsc_hwmon_channel channels[] __counted_by(nchannels);
 };
 #endif
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 gsc_hwmon_platform_data.

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

Cc Tim Harvey <[email protected]>
Signed-off-by Kees Cook <[email protected]>
Reviewed-by Gustavo A. R. Silva <[email protected]>

Thanks

Signature · 1 line
Gustavo
Quoted 16 lines
---
  include/linux/platform_data/gsc_hwmon.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/platform_data/gsc_hwmon.h +1 -1
index f2781aa7eff8..70e8a6bec0f6 100644
@@ -40,6 +40,6 @@ struct gsc_hwmon_platform_data {
  	unsigned int resolution;
  	unsigned int vreference;
  	unsigned int fan_base;
-	struct gsc_hwmon_channel channels[];
+	struct gsc_hwmon_channel channels[] __counted_by(nchannels);
  };
  #endif
author 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 gsc_hwmon_platform_data.

[...]

Since this is a trivial change and it's been 2 week without further discussion, I'll snag this patch.

Applied to for-next/hardening, thanks!

[1/1] hwmon: Annotate struct gsc_hwmon_platform_data with __counted_by

      https://git.kernel.org/kees/c/e909028ba701

Take care,

Signature · 1 line
Kees Cook