* [PATCH] x86/platform/uv: Annotate struct uv_rtc_timer_head with __counted_by
@ 2023-09-22 17:51 Kees Cook
2023-09-23 16:33 ` 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: Steve Wahl
Cc: Kees Cook, Mike Travis, Dimitri Sivanich, Russ Anderson,
Darren Hart, Andy Shevchenko, Thomas Gleixner, Ingo Molnar,
Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
platform-driver-x86, Justin Ernst, Kyle Meyer, 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 uv_rtc_timer_head.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Steve Wahl <steve.wahl@hpe.com>
Cc: Mike Travis <mike.travis@hpe.com>
Cc: Dimitri Sivanich <dimitri.sivanich@hpe.com>
Cc: Russ Anderson <russ.anderson@hpe.com>
Cc: Darren Hart <dvhart@infradead.org>
Cc: Andy Shevchenko <andy@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: x86@kernel.org
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: platform-driver-x86@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
arch/x86/platform/uv/uv_time.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/platform/uv/uv_time.c b/arch/x86/platform/uv/uv_time.c
index 54663f3e00cb..ff5afc8a5a41 100644
--- a/arch/x86/platform/uv/uv_time.c
+++ b/arch/x86/platform/uv/uv_time.c
@@ -53,7 +53,7 @@ struct uv_rtc_timer_head {
struct {
int lcpu; /* systemwide logical cpu number */
u64 expires; /* next timer expiration for this cpu */
- } cpu[];
+ } cpu[] __counted_by(ncpus);
};
/*
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] x86/platform/uv: Annotate struct uv_rtc_timer_head with __counted_by
2023-09-22 17:51 [PATCH] x86/platform/uv: Annotate struct uv_rtc_timer_head with __counted_by Kees Cook
@ 2023-09-23 16:33 ` Gustavo A. R. Silva
2023-09-24 10:40 ` [tip: x86/platform] " tip-bot2 for Kees Cook
2023-09-28 17:32 ` [PATCH] " Steve Wahl
2 siblings, 0 replies; 4+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-23 16:33 UTC (permalink / raw)
To: Kees Cook, Steve Wahl
Cc: Mike Travis, Dimitri Sivanich, Russ Anderson, Darren Hart,
Andy Shevchenko, Thomas Gleixner, Ingo Molnar, Borislav Petkov,
Dave Hansen, x86, H. Peter Anvin, platform-driver-x86,
Justin Ernst, Kyle Meyer, 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 uv_rtc_timer_head.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Steve Wahl <steve.wahl@hpe.com>
> Cc: Mike Travis <mike.travis@hpe.com>
> Cc: Dimitri Sivanich <dimitri.sivanich@hpe.com>
> Cc: Russ Anderson <russ.anderson@hpe.com>
> Cc: Darren Hart <dvhart@infradead.org>
> Cc: Andy Shevchenko <andy@infradead.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: Dave Hansen <dave.hansen@linux.intel.com>
> Cc: x86@kernel.org
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: platform-driver-x86@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> arch/x86/platform/uv/uv_time.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/platform/uv/uv_time.c b/arch/x86/platform/uv/uv_time.c
> index 54663f3e00cb..ff5afc8a5a41 100644
> --- a/arch/x86/platform/uv/uv_time.c
> +++ b/arch/x86/platform/uv/uv_time.c
> @@ -53,7 +53,7 @@ struct uv_rtc_timer_head {
> struct {
> int lcpu; /* systemwide logical cpu number */
> u64 expires; /* next timer expiration for this cpu */
> - } cpu[];
> + } cpu[] __counted_by(ncpus);
> };
>
> /*
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip: x86/platform] x86/platform/uv: Annotate struct uv_rtc_timer_head with __counted_by
2023-09-22 17:51 [PATCH] x86/platform/uv: Annotate struct uv_rtc_timer_head with __counted_by Kees Cook
2023-09-23 16:33 ` Gustavo A. R. Silva
@ 2023-09-24 10:40 ` tip-bot2 for Kees Cook
2023-09-28 17:32 ` [PATCH] " Steve Wahl
2 siblings, 0 replies; 4+ messages in thread
From: tip-bot2 for Kees Cook @ 2023-09-24 10:40 UTC (permalink / raw)
To: linux-tip-commits
Cc: Kees Cook, Ingo Molnar, Gustavo A. R. Silva, x86, linux-kernel
The following commit has been merged into the x86/platform branch of tip:
Commit-ID: d9a01959d9c954c8fe1d132b52401b0e219e37f6
Gitweb: https://git.kernel.org/tip/d9a01959d9c954c8fe1d132b52401b0e219e37f6
Author: Kees Cook <keescook@chromium.org>
AuthorDate: Fri, 22 Sep 2023 10:51:51 -07:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Sun, 24 Sep 2023 12:02:58 +02:00
x86/platform/uv: Annotate struct uv_rtc_timer_head with __counted_by
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).
Found with Coccinelle:
https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Add __counted_by for struct uv_rtc_timer_head.
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20230922175151.work.118-kees@kernel.org
---
arch/x86/platform/uv/uv_time.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/platform/uv/uv_time.c b/arch/x86/platform/uv/uv_time.c
index 54663f3..ff5afc8 100644
--- a/arch/x86/platform/uv/uv_time.c
+++ b/arch/x86/platform/uv/uv_time.c
@@ -53,7 +53,7 @@ struct uv_rtc_timer_head {
struct {
int lcpu; /* systemwide logical cpu number */
u64 expires; /* next timer expiration for this cpu */
- } cpu[];
+ } cpu[] __counted_by(ncpus);
};
/*
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] x86/platform/uv: Annotate struct uv_rtc_timer_head with __counted_by
2023-09-22 17:51 [PATCH] x86/platform/uv: Annotate struct uv_rtc_timer_head with __counted_by Kees Cook
2023-09-23 16:33 ` Gustavo A. R. Silva
2023-09-24 10:40 ` [tip: x86/platform] " tip-bot2 for Kees Cook
@ 2023-09-28 17:32 ` Steve Wahl
2 siblings, 0 replies; 4+ messages in thread
From: Steve Wahl @ 2023-09-28 17:32 UTC (permalink / raw)
To: Kees Cook
Cc: Steve Wahl, Dimitri Sivanich, Russ Anderson, Darren Hart,
Andy Shevchenko, Thomas Gleixner, Ingo Molnar, Borislav Petkov,
Dave Hansen, x86, H. Peter Anvin, platform-driver-x86,
Justin Ernst, Kyle Meyer, Nathan Chancellor, Nick Desaulniers,
Tom Rix, linux-kernel, llvm, linux-hardening
On Fri, Sep 22, 2023 at 10:51:51AM -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 uv_rtc_timer_head.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Steve Wahl <steve.wahl@hpe.com>
> Cc: Mike Travis <mike.travis@hpe.com>
> Cc: Dimitri Sivanich <dimitri.sivanich@hpe.com>
> Cc: Russ Anderson <russ.anderson@hpe.com>
> Cc: Darren Hart <dvhart@infradead.org>
> Cc: Andy Shevchenko <andy@infradead.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: Dave Hansen <dave.hansen@linux.intel.com>
> Cc: x86@kernel.org
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: platform-driver-x86@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
>
> ---
> arch/x86/platform/uv/uv_time.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/platform/uv/uv_time.c b/arch/x86/platform/uv/uv_time.c
> index 54663f3e00cb..ff5afc8a5a41 100644
> --- a/arch/x86/platform/uv/uv_time.c
> +++ b/arch/x86/platform/uv/uv_time.c
> @@ -53,7 +53,7 @@ struct uv_rtc_timer_head {
> struct {
> int lcpu; /* systemwide logical cpu number */
> u64 expires; /* next timer expiration for this cpu */
> - } cpu[];
> + } cpu[] __counted_by(ncpus);
> };
>
> /*
> --
> 2.34.1
Looks good, thanks.
Reviewed-by: Steve Wahl <steve.wahl@hpe.com>
--
Steve Wahl, Hewlett Packard Enterprise
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-09-28 17:33 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] x86/platform/uv: Annotate struct uv_rtc_timer_head with __counted_by Kees Cook
2023-09-23 16:33 ` Gustavo A. R. Silva
2023-09-24 10:40 ` [tip: x86/platform] " tip-bot2 for Kees Cook
2023-09-28 17:32 ` [PATCH] " Steve Wahl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox