* [PATCH] hwmon: Annotate struct gsc_hwmon_platform_data with __counted_by
@ 2023-09-22 17:50 Kees Cook
2023-09-23 16:31 ` Gustavo A. R. Silva
2023-10-06 20:31 ` Kees Cook
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2023-09-22 17:50 UTC (permalink / raw)
To: Tim Harvey
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 gsc_hwmon_platform_data.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
---
include/linux/platform_data/gsc_hwmon.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/platform_data/gsc_hwmon.h b/include/linux/platform_data/gsc_hwmon.h
index f2781aa7eff8..70e8a6bec0f6 100644
--- a/include/linux/platform_data/gsc_hwmon.h
+++ b/include/linux/platform_data/gsc_hwmon.h
@@ -40,6 +40,6 @@ struct gsc_hwmon_platform_data {
unsigned int resolution;
unsigned int vreference;
unsigned int fan_base;
- struct gsc_hwmon_channel channels[];
+ struct gsc_hwmon_channel channels[] __counted_by(nchannels);
};
#endif
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] hwmon: Annotate struct gsc_hwmon_platform_data with __counted_by
2023-09-22 17:50 [PATCH] hwmon: Annotate struct gsc_hwmon_platform_data with __counted_by Kees Cook
@ 2023-09-23 16:31 ` Gustavo A. R. Silva
2023-10-06 20:31 ` Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-23 16:31 UTC (permalink / raw)
To: Kees Cook, Tim Harvey
Cc: 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 gsc_hwmon_platform_data.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Tim Harvey <tharvey@gateworks.com>
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> include/linux/platform_data/gsc_hwmon.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/platform_data/gsc_hwmon.h b/include/linux/platform_data/gsc_hwmon.h
> index f2781aa7eff8..70e8a6bec0f6 100644
> --- a/include/linux/platform_data/gsc_hwmon.h
> +++ b/include/linux/platform_data/gsc_hwmon.h
> @@ -40,6 +40,6 @@ struct gsc_hwmon_platform_data {
> unsigned int resolution;
> unsigned int vreference;
> unsigned int fan_base;
> - struct gsc_hwmon_channel channels[];
> + struct gsc_hwmon_channel channels[] __counted_by(nchannels);
> };
> #endif
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] hwmon: Annotate struct gsc_hwmon_platform_data with __counted_by
2023-09-22 17:50 [PATCH] hwmon: Annotate struct gsc_hwmon_platform_data with __counted_by Kees Cook
2023-09-23 16:31 ` Gustavo A. R. Silva
@ 2023-10-06 20:31 ` Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: Kees Cook @ 2023-10-06 20:31 UTC (permalink / raw)
To: Tim Harvey, Kees Cook
Cc: Nathan Chancellor, Nick Desaulniers, Tom Rix, linux-kernel, llvm,
linux-hardening
On Fri, 22 Sep 2023 10:50:53 -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 gsc_hwmon_platform_data.
>
> [...]
Since this is a trivial change and it's been 2 week without further
discussion, I'll snag this patch.
Applied to for-next/hardening, thanks!
[1/1] hwmon: Annotate struct gsc_hwmon_platform_data with __counted_by
https://git.kernel.org/kees/c/e909028ba701
Take care,
--
Kees Cook
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-06 20:31 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] hwmon: Annotate struct gsc_hwmon_platform_data with __counted_by Kees Cook
2023-09-23 16:31 ` Gustavo A. R. Silva
2023-10-06 20:31 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox