Skip to contentSkip to conversation

afs: Annotate struct afs_permits with __counted_by

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

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 afs: Annotate struct afs_permits 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 afs_permits.

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

---
 fs/afs/internal.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/afs/internal.h +1 -1
index 07433a5349ca..469a717467a4 100644
@@ -705,7 +705,7 @@ struct afs_permits {
 	refcount_t		usage;
 	unsigned short		nr_permits;	/* Number of records */
 	bool			invalidated;	/* Invalidated due to key change */
-	struct afs_permit	permits[];	/* List of permits sorted by key pointer */
+	struct afs_permit	permits[] __counted_by(nr_permits);	/* List of permits sorted by key pointer */
 };
 
 /*
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 afs_permits.

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

Thanks

Signature · 1 line
Gustavo
Quoted 17 lines
---
  fs/afs/internal.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
fs/afs/internal.h +1 -1
index 07433a5349ca..469a717467a4 100644
@@ -705,7 +705,7 @@ struct afs_permits {
  	refcount_t		usage;
  	unsigned short		nr_permits;	/* Number of records */
  	bool			invalidated;	/* Invalidated due to key change */
-	struct afs_permit	permits[];	/* List of permits sorted by key pointer */
+	struct afs_permit	permits[] __counted_by(nr_permits);	/* List of permits sorted by key pointer */
  };
 
  /*
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 afs_permits.

[...]

Applied to for-next/hardening, thanks!

[1/1] afs: Annotate struct afs_permits with __counted_by

      https://git.kernel.org/kees/c/45faff97751a

Take care,

Signature · 1 line
Kees Cook