* [PATCH] KVM: Annotate struct kvm_irq_routing_table with __counted_by
@ 2023-09-22 17:51 Kees Cook
2023-09-23 16:32 ` Gustavo A. R. Silva
2023-10-06 20:41 ` Kees Cook
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2023-09-22 17:51 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Kees Cook, kvm, 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 kvm_irq_routing_table.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
include/linux/kvm_host.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index fb6c6109fdca..4944136efaa2 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -664,7 +664,7 @@ struct kvm_irq_routing_table {
* Array indexed by gsi. Each entry contains list of irq chips
* the gsi is connected to.
*/
- struct hlist_head map[];
+ struct hlist_head map[] __counted_by(nr_rt_entries);
};
#endif
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] KVM: Annotate struct kvm_irq_routing_table with __counted_by
2023-09-22 17:51 [PATCH] KVM: Annotate struct kvm_irq_routing_table with __counted_by Kees Cook
@ 2023-09-23 16:32 ` Gustavo A. R. Silva
2023-10-06 20:41 ` 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, Paolo Bonzini
Cc: kvm, 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 kvm_irq_routing_table.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: kvm@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> include/linux/kvm_host.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
> index fb6c6109fdca..4944136efaa2 100644
> --- a/include/linux/kvm_host.h
> +++ b/include/linux/kvm_host.h
> @@ -664,7 +664,7 @@ struct kvm_irq_routing_table {
> * Array indexed by gsi. Each entry contains list of irq chips
> * the gsi is connected to.
> */
> - struct hlist_head map[];
> + struct hlist_head map[] __counted_by(nr_rt_entries);
> };
> #endif
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] KVM: Annotate struct kvm_irq_routing_table with __counted_by
2023-09-22 17:51 [PATCH] KVM: Annotate struct kvm_irq_routing_table with __counted_by Kees Cook
2023-09-23 16:32 ` Gustavo A. R. Silva
@ 2023-10-06 20:41 ` Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: Kees Cook @ 2023-10-06 20:41 UTC (permalink / raw)
To: Paolo Bonzini, Kees Cook
Cc: kvm, Nathan Chancellor, Nick Desaulniers, Tom Rix, linux-kernel,
llvm, linux-hardening
On Fri, 22 Sep 2023 10:51:21 -0700, 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 kvm_irq_routing_table.
>
> [...]
Applied to for-next/hardening, thanks!
[1/1] KVM: Annotate struct kvm_irq_routing_table with __counted_by
https://git.kernel.org/kees/c/bbf75528039a
Take care,
--
Kees Cook
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-06 20:41 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] KVM: Annotate struct kvm_irq_routing_table with __counted_by Kees Cook
2023-09-23 16:32 ` Gustavo A. R. Silva
2023-10-06 20:41 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox