Re: [PATCH] crypto: qat: Annotate struct adf_fw_counters with __counted_by

From: Gustavo A. R. Silva
Date: Sat Sep 23 2023 - 04:56:19 EST


On Fri, Sep 22, 2023 at 10:54:33AM -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 adf_fw_counters.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Giovanni Cabiddu <giovanni.cabiddu@xxxxxxxxx>
> Cc: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
> Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
> Cc: Nathan Chancellor <nathan@xxxxxxxxxx>
> Cc: Nick Desaulniers <ndesaulniers@xxxxxxxxxx>
> Cc: Tom Rix <trix@xxxxxxxxxx>
> Cc: Adam Guerin <adam.guerin@xxxxxxxxx>
> Cc: Lucas Segarra Fernandez <lucas.segarra.fernandez@xxxxxxxxx>
> Cc: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> Cc: qat-linux@xxxxxxxxx
> Cc: linux-crypto@xxxxxxxxxxxxxxx
> Cc: llvm@xxxxxxxxxxxxxxx
> Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>

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

Thanks
--
Gustavo

> ---
> drivers/crypto/intel/qat/qat_common/adf_fw_counters.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/crypto/intel/qat/qat_common/adf_fw_counters.c b/drivers/crypto/intel/qat/qat_common/adf_fw_counters.c
> index cb6e09ef5c9f..6abe4736eab8 100644
> --- a/drivers/crypto/intel/qat/qat_common/adf_fw_counters.c
> +++ b/drivers/crypto/intel/qat/qat_common/adf_fw_counters.c
> @@ -34,7 +34,7 @@ struct adf_ae_counters {
>
> struct adf_fw_counters {
> u16 ae_count;
> - struct adf_ae_counters ae_counters[];
> + struct adf_ae_counters ae_counters[] __counted_by(ae_count);
> };
>
> static void adf_fw_counters_parse_ae_values(struct adf_ae_counters *ae_counters, u32 ae,
> --
> 2.34.1
>
>