* [PATCH] irqdomain: Annotate struct irq_domain with __counted_by
@ 2023-09-22 17:51 Kees Cook
2023-09-23 16:32 ` Gustavo A. R. Silva
2023-09-28 10:32 ` [tip: irq/core] " tip-bot2 for Kees Cook
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2023-09-22 17:51 UTC (permalink / raw)
To: Marc Zyngier
Cc: Kees Cook, Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel, llvm, linux-hardening
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 <maz@kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
---
include/linux/irqdomain.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index 51c254b7fec2..ee0a82c60508 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -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 */
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] irqdomain: Annotate struct irq_domain with __counted_by
2023-09-22 17:51 [PATCH] irqdomain: Annotate struct irq_domain with __counted_by Kees Cook
@ 2023-09-23 16:32 ` Gustavo A. R. Silva
2023-09-28 10:32 ` [tip: irq/core] " tip-bot2 for Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-23 16:32 UTC (permalink / raw)
To: Kees Cook, Marc Zyngier
Cc: Nathan Chancellor, Nick Desaulniers, Tom Rix, linux-kernel, llvm,
linux-hardening
On 9/22/23 11:51, Kees Cook wrote:
> 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 <maz@kernel.org>
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> include/linux/irqdomain.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
> index 51c254b7fec2..ee0a82c60508 100644
> --- a/include/linux/irqdomain.h
> +++ b/include/linux/irqdomain.h
> @@ -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 */
^ permalink raw reply [flat|nested] 3+ messages in thread* [tip: irq/core] irqdomain: Annotate struct irq_domain with __counted_by
2023-09-22 17:51 [PATCH] irqdomain: Annotate struct irq_domain with __counted_by Kees Cook
2023-09-23 16:32 ` Gustavo A. R. Silva
@ 2023-09-28 10:32 ` tip-bot2 for Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot2 for Kees Cook @ 2023-09-28 10:32 UTC (permalink / raw)
To: linux-tip-commits
Cc: Kees Cook, Thomas Gleixner, Gustavo A. R. Silva, x86,
linux-kernel, maz
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 <keescook@chromium.org>
AuthorDate: Fri, 22 Sep 2023 10:51:27 -07:00
Committer: Thomas Gleixner <tglx@linutronix.de>
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
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20230922175127.work.214-kees@kernel.org
---
include/linux/irqdomain.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index 51c254b..ee0a82c 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -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 */
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-28 10:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-22 17:51 [PATCH] irqdomain: Annotate struct irq_domain with __counted_by Kees Cook
2023-09-23 16:32 ` Gustavo A. R. Silva
2023-09-28 10:32 ` [tip: irq/core] " tip-bot2 for Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox