All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] scsi: target: tcmu: Annotate struct tcmu_tmr with __counted_by
@ 2023-09-22 17:53 Kees Cook
  2023-09-23 16:36 ` Gustavo A. R. Silva
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Kees Cook @ 2023-09-22 17:53 UTC (permalink / raw)
  To: Bodo Stroesser
  Cc: Kees Cook, Martin K. Petersen, linux-scsi, target-devel,
	Nathan Chancellor, Nick Desaulniers, Tom Rix, linux-kernel, llvm,
	linux-hardening

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>
---
 drivers/target/target_core_user.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
index 22cc6cac0ba2..7eb94894bd68 100644
--- a/drivers/target/target_core_user.c
+++ b/drivers/target/target_core_user.c
@@ -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);
 };
 
 /*
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] scsi: target: tcmu: Annotate struct tcmu_tmr with __counted_by
  2023-09-22 17:53 [PATCH] scsi: target: tcmu: Annotate struct tcmu_tmr with __counted_by Kees Cook
@ 2023-09-23 16:36 ` Gustavo A. R. Silva
  2023-09-24 17:06 ` Bodo Stroesser
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-23 16:36 UTC (permalink / raw)
  To: Kees Cook, Bodo Stroesser
  Cc: Martin K. Petersen, linux-scsi, target-devel, Nathan Chancellor,
	Nick Desaulniers, Tom Rix, linux-kernel, llvm, linux-hardening



On 9/22/23 11:53, Kees Cook wrote:
> 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>

Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>

Thanks
-- 
Gustavo

> ---
>   drivers/target/target_core_user.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
> index 22cc6cac0ba2..7eb94894bd68 100644
> --- a/drivers/target/target_core_user.c
> +++ b/drivers/target/target_core_user.c
> @@ -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);
>   };
>   
>   /*

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] scsi: target: tcmu: Annotate struct tcmu_tmr with __counted_by
  2023-09-22 17:53 [PATCH] scsi: target: tcmu: Annotate struct tcmu_tmr with __counted_by Kees Cook
  2023-09-23 16:36 ` Gustavo A. R. Silva
@ 2023-09-24 17:06 ` Bodo Stroesser
  2023-09-27 15:29 ` Martin K. Petersen
  2023-10-10  2:09 ` Martin K. Petersen
  3 siblings, 0 replies; 5+ messages in thread
From: Bodo Stroesser @ 2023-09-24 17:06 UTC (permalink / raw)
  To: Kees Cook
  Cc: Martin K. Petersen, linux-scsi, target-devel, Nathan Chancellor,
	Nick Desaulniers, Tom Rix, linux-kernel, llvm, linux-hardening

On 22.09.23 19:53, Kees Cook wrote:
> 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>
> ---
>   drivers/target/target_core_user.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
> index 22cc6cac0ba2..7eb94894bd68 100644
> --- a/drivers/target/target_core_user.c
> +++ b/drivers/target/target_core_user.c
> @@ -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);
>   };
>   
>   /*

Reviewed-by: Bodo Stroesser <bostroesser@gmail.com>

Thank you,
Bodo

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] scsi: target: tcmu: Annotate struct tcmu_tmr with __counted_by
  2023-09-22 17:53 [PATCH] scsi: target: tcmu: Annotate struct tcmu_tmr with __counted_by Kees Cook
  2023-09-23 16:36 ` Gustavo A. R. Silva
  2023-09-24 17:06 ` Bodo Stroesser
@ 2023-09-27 15:29 ` Martin K. Petersen
  2023-10-10  2:09 ` Martin K. Petersen
  3 siblings, 0 replies; 5+ messages in thread
From: Martin K. Petersen @ 2023-09-27 15:29 UTC (permalink / raw)
  To: Kees Cook
  Cc: Bodo Stroesser, Martin K. Petersen, linux-scsi, target-devel,
	Nathan Chancellor, Nick Desaulniers, Tom Rix, linux-kernel, llvm,
	linux-hardening


Kees,

> 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).

Applied to 6.7/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] scsi: target: tcmu: Annotate struct tcmu_tmr with __counted_by
  2023-09-22 17:53 [PATCH] scsi: target: tcmu: Annotate struct tcmu_tmr with __counted_by Kees Cook
                   ` (2 preceding siblings ...)
  2023-09-27 15:29 ` Martin K. Petersen
@ 2023-10-10  2:09 ` Martin K. Petersen
  3 siblings, 0 replies; 5+ messages in thread
From: Martin K. Petersen @ 2023-10-10  2:09 UTC (permalink / raw)
  To: Bodo Stroesser, Kees Cook
  Cc: Martin K . Petersen, linux-scsi, target-devel, Nathan Chancellor,
	Nick Desaulniers, Tom Rix, linux-kernel, llvm, linux-hardening

On Fri, 22 Sep 2023 10:53:01 -0700, Kees Cook wrote:

> 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.
> 
> [...]

Applied to 6.7/scsi-queue, thanks!

[1/1] scsi: target: tcmu: Annotate struct tcmu_tmr with __counted_by
      https://git.kernel.org/mkp/scsi/c/caf22c969ed1

-- 
Martin K. Petersen	Oracle Linux Engineering

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-10-10  2:09 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-22 17:53 [PATCH] scsi: target: tcmu: Annotate struct tcmu_tmr with __counted_by Kees Cook
2023-09-23 16:36 ` Gustavo A. R. Silva
2023-09-24 17:06 ` Bodo Stroesser
2023-09-27 15:29 ` Martin K. Petersen
2023-10-10  2:09 ` Martin K. Petersen

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.