* [PATCH] virtio_console: Annotate struct port_buffer with __counted_by
@ 2023-09-22 17:51 Kees Cook
2023-09-23 16:32 ` Gustavo A. R. Silva
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Kees Cook @ 2023-09-22 17:51 UTC (permalink / raw)
To: Amit Shah
Cc: Kees Cook, Arnd Bergmann, Greg Kroah-Hartman, llvm,
Nick Desaulniers, linux-kernel, virtualization, Nathan Chancellor,
linux-hardening, Tom Rix
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 port_buffer.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Amit Shah <amit@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: virtualization@lists.linux-foundation.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/char/virtio_console.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 680d1ef2a217..431e9e5bf9c1 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -106,7 +106,7 @@ struct port_buffer {
unsigned int sgpages;
/* sg is used if spages > 0. sg must be the last in is struct */
- struct scatterlist sg[];
+ struct scatterlist sg[] __counted_by(sgpages);
};
/*
--
2.34.1
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] virtio_console: Annotate struct port_buffer with __counted_by
2023-09-22 17:51 [PATCH] virtio_console: Annotate struct port_buffer with __counted_by Kees Cook
@ 2023-09-23 16:32 ` Gustavo A. R. Silva
2023-09-25 11:24 ` Amit Shah
2023-10-24 21:18 ` Kees Cook
2 siblings, 0 replies; 4+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-23 16:32 UTC (permalink / raw)
To: Kees Cook, Amit Shah
Cc: Arnd Bergmann, Greg Kroah-Hartman, llvm, Nick Desaulniers,
linux-kernel, virtualization, Nathan Chancellor, linux-hardening,
Tom Rix
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 port_buffer.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Amit Shah <amit@kernel.org>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: virtualization@lists.linux-foundation.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> drivers/char/virtio_console.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
> index 680d1ef2a217..431e9e5bf9c1 100644
> --- a/drivers/char/virtio_console.c
> +++ b/drivers/char/virtio_console.c
> @@ -106,7 +106,7 @@ struct port_buffer {
> unsigned int sgpages;
>
> /* sg is used if spages > 0. sg must be the last in is struct */
> - struct scatterlist sg[];
> + struct scatterlist sg[] __counted_by(sgpages);
> };
>
> /*
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] virtio_console: Annotate struct port_buffer with __counted_by
2023-09-22 17:51 [PATCH] virtio_console: Annotate struct port_buffer with __counted_by Kees Cook
2023-09-23 16:32 ` Gustavo A. R. Silva
@ 2023-09-25 11:24 ` Amit Shah
2023-10-24 21:18 ` Kees Cook
2 siblings, 0 replies; 4+ messages in thread
From: Amit Shah @ 2023-09-25 11:24 UTC (permalink / raw)
To: Kees Cook, Amit Shah
Cc: Arnd Bergmann, Greg Kroah-Hartman, llvm, Nick Desaulniers,
linux-kernel, virtualization, Nathan Chancellor, linux-hardening,
Tom Rix
On Fri, 2023-09-22 at 10:51 -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 port_buffer.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Amit Shah <amit@kernel.org>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: virtualization@lists.linux-foundation.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> drivers/char/virtio_console.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
> index 680d1ef2a217..431e9e5bf9c1 100644
> --- a/drivers/char/virtio_console.c
> +++ b/drivers/char/virtio_console.c
> @@ -106,7 +106,7 @@ struct port_buffer {
> unsigned int sgpages;
>
> /* sg is used if spages > 0. sg must be the last in is struct */
> - struct scatterlist sg[];
> + struct scatterlist sg[] __counted_by(sgpages);
> };
Reviewed-by: Amit Shah <amit@kernel.org>
Greg, please pick this up.
Thanks,
Amit
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] virtio_console: Annotate struct port_buffer with __counted_by
2023-09-22 17:51 [PATCH] virtio_console: Annotate struct port_buffer with __counted_by Kees Cook
2023-09-23 16:32 ` Gustavo A. R. Silva
2023-09-25 11:24 ` Amit Shah
@ 2023-10-24 21:18 ` Kees Cook
2 siblings, 0 replies; 4+ messages in thread
From: Kees Cook @ 2023-10-24 21:18 UTC (permalink / raw)
To: Amit Shah, Kees Cook
Cc: Arnd Bergmann, Greg Kroah-Hartman, llvm, Nick Desaulniers,
linux-kernel, virtualization, Nathan Chancellor, linux-hardening,
Tom Rix
On Fri, 22 Sep 2023 10:51:15 -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 port_buffer.
>
> [...]
Applied to for-next/hardening, thanks!
[1/1] virtio_console: Annotate struct port_buffer with __counted_by
https://git.kernel.org/kees/c/bf5abc17bc43
Take care,
--
Kees Cook
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-10-24 21:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-22 17:51 [PATCH] virtio_console: Annotate struct port_buffer with __counted_by Kees Cook
2023-09-23 16:32 ` Gustavo A. R. Silva
2023-09-25 11:24 ` Amit Shah
2023-10-24 21:18 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).