Skip to contentSkip to conversation

irqdomain: Annotate struct irq_domain with __counted_by

PATCH Applied Kees Cook 3 participants 3 messages Sep 22, 2023 – Sep 28, 2023 IRQ domains (IRQ number mapping library)

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 irqdomain: Annotate struct irq_domain 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 irq_domain.

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

Cc Marc Zyngier <[email protected]>
---
 include/linux/irqdomain.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/irqdomain.h +1 -1
index 51c254b7fec2..ee0a82c60508 100644
@@ -174,7 +174,7 @@ struct irq_domain {
 	irq_hw_number_t			hwirq_max;
 	unsigned int			revmap_size;
 	struct radix_tree_root		revmap_tree;
-	struct irq_data __rcu		*revmap[];
+	struct irq_data __rcu		*revmap[] __counted_by(revmap_size);
 };
 
 /* Irq domain flags */
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 irq_domain.

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

Cc Marc Zyngier <[email protected]>

Thanks

Signature · 1 line
Gustavo
Quoted 17 lines
---
  include/linux/irqdomain.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/irqdomain.h +1 -1
index 51c254b7fec2..ee0a82c60508 100644
@@ -174,7 +174,7 @@ struct irq_domain {
  	irq_hw_number_t			hwirq_max;
  	unsigned int			revmap_size;
  	struct radix_tree_root		revmap_tree;
-	struct irq_data __rcu		*revmap[];
+	struct irq_data __rcu		*revmap[] __counted_by(revmap_size);
  };
 
  /* Irq domain flags */
merge bot Applied
#2 lore raw
In reply to Kees Cook
The following commit has been merged into the irq/core branch of tip:

The following commit has been merged into the irq/core branch of tip:

Commit-ID:     6260ecd04594360ae2af104fb2641317728a66e4
Gitweb:        https://git.kernel.org/tip/6260ecd04594360ae2af104fb2641317728a66e4
Author:        Kees Cook <[email protected]>
AuthorDate:    Fri, 22 Sep 2023 10:51:27 -07:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Thu, 28 Sep 2023 12:25:31 +02:00

irqdomain: Annotate struct irq_domain 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 irq_domain.

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

---
 include/linux/irqdomain.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/irqdomain.h +1 -1
index 51c254b..ee0a82c 100644
@@ -174,7 +174,7 @@ struct irq_domain {
 	irq_hw_number_t			hwirq_max;
 	unsigned int			revmap_size;
 	struct radix_tree_root		revmap_tree;
-	struct irq_data __rcu		*revmap[];
+	struct irq_data __rcu		*revmap[] __counted_by(revmap_size);
 };
 
 /* Irq domain flags */