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.cabi...@intel.com>
Cc: Herbert Xu <herb...@gondor.apana.org.au>
Cc: "David S. Miller" <da...@davemloft.net>
Cc: Nathan Chancellor <nat...@kernel.org>
Cc: Nick Desaulniers <ndesaulni...@google.com>
Cc: Tom Rix <t...@redhat.com>
Cc: Adam Guerin <adam.gue...@intel.com>
Cc: Lucas Segarra Fernandez <lucas.segarra.fernan...@intel.com>
Cc: Andy Shevchenko <andriy.shevche...@linux.intel.com>
Cc: qat-li...@intel.com
Cc: linux-crypto@vger.kernel.org
Cc: l...@lists.linux.dev
Signed-off-by: Kees Cook <keesc...@chromium.org>
---
 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


Reply via email to