* [PATCH] NFS/flexfiles: Annotate struct nfs4_ff_layout_segment with __counted_by
@ 2023-09-15 20:14 Kees Cook
2023-09-15 20:50 ` Gustavo A. R. Silva
2023-09-29 19:23 ` Kees Cook
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2023-09-15 20:14 UTC (permalink / raw)
To: Trond Myklebust
Cc: Kees Cook, Anna Schumaker, linux-nfs, 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 nfs4_ff_layout_segment.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Trond Myklebust <trond.myklebust@hammerspace.com>
Cc: Anna Schumaker <anna@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
fs/nfs/flexfilelayout/flexfilelayout.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/nfs/flexfilelayout/flexfilelayout.h b/fs/nfs/flexfilelayout/flexfilelayout.h
index 354a031c69b1..f84b3fb0dddd 100644
--- a/fs/nfs/flexfilelayout/flexfilelayout.h
+++ b/fs/nfs/flexfilelayout/flexfilelayout.h
@@ -99,7 +99,7 @@ struct nfs4_ff_layout_segment {
u64 stripe_unit;
u32 flags;
u32 mirror_array_cnt;
- struct nfs4_ff_layout_mirror *mirror_array[];
+ struct nfs4_ff_layout_mirror *mirror_array[] __counted_by(mirror_array_cnt);
};
struct nfs4_flexfile_layout {
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] NFS/flexfiles: Annotate struct nfs4_ff_layout_segment with __counted_by
2023-09-15 20:14 [PATCH] NFS/flexfiles: Annotate struct nfs4_ff_layout_segment with __counted_by Kees Cook
@ 2023-09-15 20:50 ` Gustavo A. R. Silva
2023-09-29 19:23 ` Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-15 20:50 UTC (permalink / raw)
To: Kees Cook, Trond Myklebust
Cc: Anna Schumaker, linux-nfs, Nathan Chancellor, Nick Desaulniers,
Tom Rix, linux-kernel, llvm, linux-hardening
On 9/15/23 14:14, 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 nfs4_ff_layout_segment.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Trond Myklebust <trond.myklebust@hammerspace.com>
> Cc: Anna Schumaker <anna@kernel.org>
> Cc: linux-nfs@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> fs/nfs/flexfilelayout/flexfilelayout.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfs/flexfilelayout/flexfilelayout.h b/fs/nfs/flexfilelayout/flexfilelayout.h
> index 354a031c69b1..f84b3fb0dddd 100644
> --- a/fs/nfs/flexfilelayout/flexfilelayout.h
> +++ b/fs/nfs/flexfilelayout/flexfilelayout.h
> @@ -99,7 +99,7 @@ struct nfs4_ff_layout_segment {
> u64 stripe_unit;
> u32 flags;
> u32 mirror_array_cnt;
> - struct nfs4_ff_layout_mirror *mirror_array[];
> + struct nfs4_ff_layout_mirror *mirror_array[] __counted_by(mirror_array_cnt);
> };
>
> struct nfs4_flexfile_layout {
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] NFS/flexfiles: Annotate struct nfs4_ff_layout_segment with __counted_by
2023-09-15 20:14 [PATCH] NFS/flexfiles: Annotate struct nfs4_ff_layout_segment with __counted_by Kees Cook
2023-09-15 20:50 ` Gustavo A. R. Silva
@ 2023-09-29 19:23 ` Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: Kees Cook @ 2023-09-29 19:23 UTC (permalink / raw)
To: Trond Myklebust, Kees Cook
Cc: Anna Schumaker, linux-nfs, Nathan Chancellor, Nick Desaulniers,
Tom Rix, linux-kernel, llvm, linux-hardening
On Fri, 15 Sep 2023 13:14:39 -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 nfs4_ff_layout_segment.
>
> [...]
Applied to for-next/hardening, thanks!
[1/1] NFS/flexfiles: Annotate struct nfs4_ff_layout_segment with __counted_by
https://git.kernel.org/kees/c/f8ead26ffdee
Take care,
--
Kees Cook
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-29 19:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-15 20:14 [PATCH] NFS/flexfiles: Annotate struct nfs4_ff_layout_segment with __counted_by Kees Cook
2023-09-15 20:50 ` Gustavo A. R. Silva
2023-09-29 19:23 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox