Skip to contentSkip to conversation

nfs41: Annotate struct nfs4_file_layout_dsaddr with __counted_by

PATCH Applied Kees Cook 1 participant 2 messages Sep 15, 2023 – Sep 29, 2023

Subsystems (2)
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 nfs41: Annotate struct nfs4_file_layout_dsaddr 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 nfs4_file_layout_dsaddr.

[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci

Cc Trond Myklebust <[email protected]>
Cc Anna Schumaker <[email protected]>
Cc "Gustavo A. R. Silva" <[email protected]>
---
 fs/nfs/filelayout/filelayout.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/filelayout/filelayout.h +1 -1
index aed0748fd6ec..c7bb5da93307 100644
@@ -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 {
Signature · 1 line
2.34.1
author Applied
#1 lore raw
Quoted 9 lines · Kees Cook

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,

Signature · 1 line
Kees Cook