dm: Annotate struct dm_bio_prison with __counted_by
authorKees Cook <keescook@chromium.org>
Fri, 15 Sep 2023 20:04:08 +0000 (13:04 -0700)
committerKees Cook <keescook@chromium.org>
Mon, 2 Oct 2023 16:48:53 +0000 (09:48 -0700)
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

Cc: Alasdair Kergon <agk@redhat.com>
Cc: Mike Snitzer <snitzer@kernel.org>
Cc: dm-devel@redhat.com
Reviewed-by: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20230915200407.never.611-kees@kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
drivers/md/dm-bio-prison-v1.c

index 92afdca760aeb5bbd4710a98931850416684a77d..9ab32abe5ed4db9654da200e41f1f0dc803f8060 100644 (file)
@@ -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;