* [PATCH] nfs41: Annotate struct nfs4_file_layout_dsaddr with __counted_by
@ 2023-09-15 20:14 Kees Cook
2023-09-29 19:23 ` Kees Cook
0 siblings, 1 reply; 2+ messages in thread
From: Kees Cook @ 2023-09-15 20:14 UTC (permalink / raw)
To: Trond Myklebust
Cc: Kees Cook, Anna Schumaker, Gustavo A. R. Silva, 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_file_layout_dsaddr.
[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: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
fs/nfs/filelayout/filelayout.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/nfs/filelayout/filelayout.h b/fs/nfs/filelayout/filelayout.h
index aed0748fd6ec..c7bb5da93307 100644
--- a/fs/nfs/filelayout/filelayout.h
+++ b/fs/nfs/filelayout/filelayout.h
@@ -51,7 +51,7 @@ struct nfs4_file_layout_dsaddr {
u32 stripe_count;
u8 *stripe_indices;
u32 ds_num;
- struct nfs4_pnfs_ds *ds_list[];
+ struct nfs4_pnfs_ds *ds_list[] __counted_by(ds_num);
};
struct nfs4_filelayout_segment {
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] nfs41: Annotate struct nfs4_file_layout_dsaddr with __counted_by
2023-09-15 20:14 [PATCH] nfs41: Annotate struct nfs4_file_layout_dsaddr with __counted_by Kees Cook
@ 2023-09-29 19:23 ` Kees Cook
0 siblings, 0 replies; 2+ messages in thread
From: Kees Cook @ 2023-09-29 19:23 UTC (permalink / raw)
To: Trond Myklebust, Kees Cook
Cc: Anna Schumaker, Gustavo A. R. Silva, linux-nfs, Nathan Chancellor,
Nick Desaulniers, Tom Rix, linux-kernel, llvm, linux-hardening
On Fri, 15 Sep 2023 13:14:27 -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_file_layout_dsaddr.
>
> [...]
Applied to for-next/hardening, thanks!
[1/1] nfs41: Annotate struct nfs4_file_layout_dsaddr with __counted_by
https://git.kernel.org/kees/c/4d8e2b2fb0cf
Take care,
--
Kees Cook
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-09-29 19:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-15 20:14 [PATCH] nfs41: Annotate struct nfs4_file_layout_dsaddr with __counted_by Kees Cook
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;
as well as URLs for NNTP newsgroup(s).