Skip to contentSkip to conversation

driver core: platform: Annotate struct irq_affinity_devres with __counted_by

PATCH In review Kees Cook 2 participants 2 messages Oct 6, 2023 Driver core

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 driver core: platform: Annotate struct irq_affinity_devres 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).

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

---
 drivers/base/platform.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/platform.c +1 -1
index 76bfcba25003..07216889d3ba 100644
@@ -291,7 +291,7 @@ EXPORT_SYMBOL_GPL(platform_irq_count);
 
 struct irq_affinity_devres {
 	unsigned int count;
-	unsigned int irq[];
+	unsigned int irq[] __counted_by(count);
 };
 
 static void platform_disable_acpi_irq(struct platform_device *pdev, int index)
Signature · 1 line
2.34.1
Reviewed-by on v1 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).

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

Quoted 6 lines

Thanks!

Signature · 1 line
Gustavo
Quoted 17 lines
---
  drivers/base/platform.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/platform.c +1 -1
index 76bfcba25003..07216889d3ba 100644
@@ -291,7 +291,7 @@ EXPORT_SYMBOL_GPL(platform_irq_count);
 
  struct irq_affinity_devres {
  	unsigned int count;
-	unsigned int irq[];
+	unsigned int irq[] __counted_by(count);
  };
 
  static void platform_disable_acpi_irq(struct platform_device *pdev, int index)