x86/platform/uv: Annotate struct uv_rtc_timer_head with __counted_by
Subsystems (3)
PATCH 1/1 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).
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
--- arch/x86/platform/uv/uv_time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/platform/uv/uv_time.c +1 -1
@@ -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); };/*
Signature · 1 line
2.34.1
Quoted 10 lines · Kees Cook
Prepare for the coming implementation by GCC and Clang of the
__counted_byattribute. Flexible array members annotated with__counted_bycan have their accesses bounds-checked at run-time checking viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).As found with Coccinelle[1], add
__counted_byfor structuv_rtc_timer_head.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Quoted 14 lines
Cc Steve Wahl <[email protected]>Cc Mike Travis <[email protected]>Cc Dimitri Sivanich <[email protected]>Cc Russ Anderson <[email protected]>Cc Darren Hart <[email protected]>Cc Andy Shevchenko <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>Cc Dave Hansen <[email protected]>Cc "H. Peter Anvin" <[email protected]>Signed-off-by Kees Cook <[email protected]>
Thanks
Signature · 1 line
Gustavo
Quoted 17 lines
--- arch/x86/platform/uv/uv_time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/x86/platform/uv/uv_time.c +1
-1@@ -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); };/*
The following commit has been merged into the x86/platform branch of tip:
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 <[email protected]> AuthorDate: Fri, 22 Sep 2023 10:51:51 -07:00 Committer: Ingo Molnar <[email protected]> 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.
--- arch/x86/platform/uv/uv_time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/platform/uv/uv_time.c +1 -1
@@ -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); };/*
Quoted 44 lines · Kees Cook
Prepare for the coming implementation by GCC and Clang of the
__counted_byattribute. Flexible array members annotated with__counted_bycan have their accesses bounds-checked at run-time checking viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).As found with Coccinelle[1], add
__counted_byfor structuv_rtc_timer_head.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc Steve Wahl <[email protected]>Cc Mike Travis <[email protected]>Cc Dimitri Sivanich <[email protected]>Cc Russ Anderson <[email protected]>Cc Darren Hart <[email protected]>Cc Andy Shevchenko <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>Cc Dave Hansen <[email protected]>Cc "H. Peter Anvin" <[email protected]>Signed-off-by Kees Cook <[email protected]>--- arch/x86/platform/uv/uv_time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/x86/platform/uv/uv_time.c +1
-1@@ -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); };/* Signature · 1 line
2.34.1
Looks good, thanks.
Signature · 1 line
Steve Wahl, Hewlett Packard Enterprise