* [PATCH] libata: Annotate struct ata_cpr_log with __counted_by
@ 2023-09-22 17:52 Kees Cook
2023-09-23 16:35 ` Gustavo A. R. Silva
2023-09-25 7:03 ` Damien Le Moal
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2023-09-22 17:52 UTC (permalink / raw)
To: Damien Le Moal
Cc: Kees Cook, linux-ide, 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 ata_cpr_log.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Damien Le Moal <dlemoal@kernel.org>
Cc: linux-ide@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
include/linux/libata.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 3c17a5053f00..f91e8e7f1c00 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -656,7 +656,7 @@ struct ata_cpr {
struct ata_cpr_log {
u8 nr_cpr;
- struct ata_cpr cpr[];
+ struct ata_cpr cpr[] __counted_by(nr_cpr);
};
struct ata_device {
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] libata: Annotate struct ata_cpr_log with __counted_by
2023-09-22 17:52 [PATCH] libata: Annotate struct ata_cpr_log with __counted_by Kees Cook
@ 2023-09-23 16:35 ` Gustavo A. R. Silva
2023-09-25 7:03 ` Damien Le Moal
1 sibling, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-23 16:35 UTC (permalink / raw)
To: Kees Cook, Damien Le Moal
Cc: linux-ide, Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel, llvm, linux-hardening
On 9/22/23 11:52, 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 ata_cpr_log.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Damien Le Moal <dlemoal@kernel.org>
> Cc: linux-ide@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> include/linux/libata.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/libata.h b/include/linux/libata.h
> index 3c17a5053f00..f91e8e7f1c00 100644
> --- a/include/linux/libata.h
> +++ b/include/linux/libata.h
> @@ -656,7 +656,7 @@ struct ata_cpr {
>
> struct ata_cpr_log {
> u8 nr_cpr;
> - struct ata_cpr cpr[];
> + struct ata_cpr cpr[] __counted_by(nr_cpr);
> };
>
> struct ata_device {
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] libata: Annotate struct ata_cpr_log with __counted_by
2023-09-22 17:52 [PATCH] libata: Annotate struct ata_cpr_log with __counted_by Kees Cook
2023-09-23 16:35 ` Gustavo A. R. Silva
@ 2023-09-25 7:03 ` Damien Le Moal
1 sibling, 0 replies; 3+ messages in thread
From: Damien Le Moal @ 2023-09-25 7:03 UTC (permalink / raw)
To: Kees Cook
Cc: linux-ide, Nathan Chancellor, Nick Desaulniers, Tom Rix,
linux-kernel, llvm, linux-hardening
On 2023/09/22 19:52, 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 ata_cpr_log.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Damien Le Moal <dlemoal@kernel.org>
> Cc: linux-ide@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Applied to for-6.7. Thanks !
--
Damien Le Moal
Western Digital Research
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-25 7:03 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:52 [PATCH] libata: Annotate struct ata_cpr_log with __counted_by Kees Cook
2023-09-23 16:35 ` Gustavo A. R. Silva
2023-09-25 7:03 ` Damien Le Moal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox