dm: Annotate struct dm_stat with __counted_by
PATCH 1/1 dm: Annotate struct dm_stat 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_stat.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
--- drivers/md/dm-stats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-stats.c +1 -1
@@ -56,7 +56,7 @@ struct dm_stat {size_t percpu_alloc_size;size_t histogram_alloc_size;struct dm_stat_percpu *stat_percpu[NR_CPUS ]; -struct dm_stat_shared stat_shared[]; + struct dm_stat_shared stat_shared[] __counted_by(n_entries); };#define STAT_PRECISE_TIMESTAMPS 1
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_stat.[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 17 lines
--- drivers/md/dm-stats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/md/dm-stats.c +1
-1@@ -56,7 +56,7 @@ struct dm_stat {size_t percpu_alloc_size;size_t histogram_alloc_size;struct dm_stat_percpu *stat_percpu[NR_CPUS ]; -struct dm_stat_shared stat_shared[]; + struct dm_stat_shared stat_shared[] __counted_by(n_entries); };#define STAT_PRECISE_TIMESTAMPS 1
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_stat.[...]
Applied to for-next/hardening, thanks!
[1/1] dm: Annotate struct dm_stat with __counted_by
https://git.kernel.org/kees/c/e9d842d479ac
Take care,
Signature · 1 line
Kees Cook