* [PATCH] mfd: iqs62x: Annotate struct iqs62x_fw_blk with __counted_by
@ 2023-09-22 17:53 Kees Cook
2023-09-23 16:37 ` Gustavo A. R. Silva
2023-09-28 13:19 ` (subset) " Lee Jones
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2023-09-22 17:53 UTC (permalink / raw)
To: Lee Jones
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 iqs62x_fw_blk.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Lee Jones <lee@kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/mfd/iqs62x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mfd/iqs62x.c b/drivers/mfd/iqs62x.c
index e03b4d38fbb0..1b465590567c 100644
--- a/drivers/mfd/iqs62x.c
+++ b/drivers/mfd/iqs62x.c
@@ -96,7 +96,7 @@ struct iqs62x_fw_blk {
u8 addr;
u8 mask;
u8 len;
- u8 data[];
+ u8 data[] __counted_by(len);
};
struct iqs62x_info {
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mfd: iqs62x: Annotate struct iqs62x_fw_blk with __counted_by
2023-09-22 17:53 [PATCH] mfd: iqs62x: Annotate struct iqs62x_fw_blk with __counted_by Kees Cook
@ 2023-09-23 16:37 ` Gustavo A. R. Silva
2023-09-28 13:19 ` (subset) " Lee Jones
1 sibling, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-23 16:37 UTC (permalink / raw)
To: Kees Cook, Lee Jones
Cc: Nathan Chancellor, Nick Desaulniers, Tom Rix, linux-kernel, llvm,
linux-hardening
On 9/22/23 11:53, 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 iqs62x_fw_blk.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Lee Jones <lee@kernel.org>
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> drivers/mfd/iqs62x.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mfd/iqs62x.c b/drivers/mfd/iqs62x.c
> index e03b4d38fbb0..1b465590567c 100644
> --- a/drivers/mfd/iqs62x.c
> +++ b/drivers/mfd/iqs62x.c
> @@ -96,7 +96,7 @@ struct iqs62x_fw_blk {
> u8 addr;
> u8 mask;
> u8 len;
> - u8 data[];
> + u8 data[] __counted_by(len);
> };
>
> struct iqs62x_info {
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: (subset) [PATCH] mfd: iqs62x: Annotate struct iqs62x_fw_blk with __counted_by
2023-09-22 17:53 [PATCH] mfd: iqs62x: Annotate struct iqs62x_fw_blk with __counted_by Kees Cook
2023-09-23 16:37 ` Gustavo A. R. Silva
@ 2023-09-28 13:19 ` Lee Jones
1 sibling, 0 replies; 3+ messages in thread
From: Lee Jones @ 2023-09-28 13:19 UTC (permalink / raw)
To: Lee Jones, Kees Cook
Cc: Nathan Chancellor, Nick Desaulniers, Tom Rix, linux-kernel, llvm,
linux-hardening
On Fri, 22 Sep 2023 10:53:38 -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 iqs62x_fw_blk.
>
> [...]
Applied, thanks!
[1/1] mfd: iqs62x: Annotate struct iqs62x_fw_blk with __counted_by
commit: d25fad59146b4fb24f690bc0bedd32a299bc1541
--
Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-28 13:19 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:53 [PATCH] mfd: iqs62x: Annotate struct iqs62x_fw_blk with __counted_by Kees Cook
2023-09-23 16:37 ` Gustavo A. R. Silva
2023-09-28 13:19 ` (subset) " Lee Jones
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).