* [PATCH] input: Annotate struct evdev_client with __counted_by
@ 2023-09-22 17:50 Kees Cook
2023-09-23 16:29 ` Gustavo A. R. Silva
2023-09-30 16:36 ` Dmitry Torokhov
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2023-09-22 17:50 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Kees Cook, linux-input, 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 evdev_client.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/input/evdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 95f90699d2b1..51e0c4954600 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -50,7 +50,7 @@ struct evdev_client {
bool revoked;
unsigned long *evmasks[EV_CNT];
unsigned int bufsize;
- struct input_event buffer[];
+ struct input_event buffer[] __counted_by(bufsize);
};
static size_t evdev_get_mask_cnt(unsigned int type)
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] input: Annotate struct evdev_client with __counted_by
2023-09-22 17:50 [PATCH] input: Annotate struct evdev_client with __counted_by Kees Cook
@ 2023-09-23 16:29 ` Gustavo A. R. Silva
2023-09-30 16:36 ` Dmitry Torokhov
1 sibling, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-23 16:29 UTC (permalink / raw)
To: Kees Cook, Dmitry Torokhov
Cc: linux-input, Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel, llvm, linux-hardening
On 9/22/23 11:50, 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 evdev_client.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: linux-input@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> drivers/input/evdev.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
> index 95f90699d2b1..51e0c4954600 100644
> --- a/drivers/input/evdev.c
> +++ b/drivers/input/evdev.c
> @@ -50,7 +50,7 @@ struct evdev_client {
> bool revoked;
> unsigned long *evmasks[EV_CNT];
> unsigned int bufsize;
> - struct input_event buffer[];
> + struct input_event buffer[] __counted_by(bufsize);
> };
>
> static size_t evdev_get_mask_cnt(unsigned int type)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] input: Annotate struct evdev_client with __counted_by
2023-09-22 17:50 [PATCH] input: Annotate struct evdev_client with __counted_by Kees Cook
2023-09-23 16:29 ` Gustavo A. R. Silva
@ 2023-09-30 16:36 ` Dmitry Torokhov
1 sibling, 0 replies; 3+ messages in thread
From: Dmitry Torokhov @ 2023-09-30 16:36 UTC (permalink / raw)
To: Kees Cook
Cc: linux-input, Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel, llvm, linux-hardening
On Fri, Sep 22, 2023 at 10:50:28AM -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 evdev_client.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: linux-input@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Applied, thank you.
--
Dmitry
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-30 16:36 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:50 [PATCH] input: Annotate struct evdev_client with __counted_by Kees Cook
2023-09-23 16:29 ` Gustavo A. R. Silva
2023-09-30 16:36 ` Dmitry Torokhov
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).