scsi: target: tcmu: Annotate struct tcmu_tmr with __counted_by
authorKees Cook <keescook@chromium.org>
Fri, 22 Sep 2023 17:53:01 +0000 (10:53 -0700)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 27 Sep 2023 15:28:48 +0000 (11:28 -0400)
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 tcmu_tmr.

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

Cc: Bodo Stroesser <bostroesser@gmail.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org
Cc: target-devel@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20230922175300.work.148-kees@kernel.org
Reviewed-by: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Reviewed-by: Bodo Stroesser <bostroesser@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/target/target_core_user.c

index 22cc6cac0ba2b5704873aaa73bab75ea37cb235a..7eb94894bd68faf639a9fc02da004b986df89c2b 100644 (file)
@@ -201,7 +201,7 @@ struct tcmu_tmr {
 
        uint8_t tmr_type;
        uint32_t tmr_cmd_cnt;
-       int16_t tmr_cmd_ids[];
+       int16_t tmr_cmd_ids[] __counted_by(tmr_cmd_cnt);
 };
 
 /*