Skip to contentSkip to conversation

NFS/flexfiles: Annotate struct nfs4_ff_layout_segment with __counted_by

PATCH Applied Kees Cook 2 participants 3 messages Sep 15, 2023 – Sep 29, 2023

Subsystems (2)
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 NFS/flexfiles: Annotate struct nfs4_ff_layout_segment 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_ff_layout_segment.

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

Cc Trond Myklebust <[email protected]>
Cc Anna Schumaker <[email protected]>
---
 fs/nfs/flexfilelayout/flexfilelayout.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/flexfilelayout/flexfilelayout.h +1 -1
index 354a031c69b1..f84b3fb0dddd 100644
@@ -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 {
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 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).

Quoted 8 lines

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 <[email protected]>
Cc Anna Schumaker <[email protected]>

Thanks

Signature · 1 line
Gustavo
Quoted 17 lines
---
  fs/nfs/flexfilelayout/flexfilelayout.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/flexfilelayout/flexfilelayout.h +1 -1
index 354a031c69b1..f84b3fb0dddd 100644
@@ -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 {
author Applied
#2 lore raw
In reply to Kees Cook
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_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,

Signature · 1 line
Kees Cook