dm: Annotate struct dm_bio_prison with __counted_by
PATCH 1/1 dm: Annotate struct dm_bio_prison 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 dm_bio_prison.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
--- drivers/md/dm-bio-prison-v1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-bio-prison-v1.c +1 -1
@@ -26,7 +26,7 @@ struct prison_region {struct dm_bio_prison {mempool_t cell_pool;unsigned int num_locks; -struct prison_region regions[]; + struct prison_region regions[] __counted_by(num_locks); };static struct kmem_cache *_cell_cache;
Signature · 1 line
2.34.1
Quoted 6 lines · Kees Cook
Prepare for the coming implementation by GCC and Clang of the
__counted_byattribute. Flexible array members annotated with__counted_bycan have their accesses bounds-checked at run-time checking viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).
Quoted 8 lines
As found with Coccinelle[1], add
__counted_byfor structdm_bio_prison.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc Alasdair Kergon <[email protected]>Cc Mike Snitzer <[email protected]>Signed-off-by Kees Cook <[email protected]>
Thanks
Signature · 1 line
Gustavo
Quoted 9 lines
--- drivers/md/dm-bio-prison-v1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/md/dm-bio-prison-v1.c +0
-0
drivers/md/dm-bio-prison-v1.c struct prison_region { · line 32
Quoted 8 lines
drivers/md/dm-bio-prison-v1.c +1
-1@@ -26,7 +26,7 @@ struct prison_region {struct dm_bio_prison {mempool_t cell_pool;unsigned int num_locks; -struct prison_region regions[]; + struct prison_region regions[] __counted_by(num_locks); };static struct kmem_cache *_cell_cache;
--
dm-devel mailing list
[email protected]
https://listman.redhat.com/mailman/listinfo/dm-devel
Kees Cook
AppliedQuoted 9 lines · Kees Cook
Prepare for the coming implementation by GCC and Clang of the
__counted_byattribute. Flexible array members annotated with__counted_bycan have their accesses bounds-checked at run-time checking viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).As found with Coccinelle[1], add
__counted_byfor structdm_bio_prison.[...]
Applied to for-next/hardening, thanks!
[1/1] dm: Annotate struct dm_bio_prison with __counted_by
https://git.kernel.org/kees/c/1eb1f6b6c911
Take care,
Signature · 1 line
Kees Cook