]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: p54: Annotate struct p54_cal_database with __counted_by
authorKees Cook <keescook@chromium.org>
Mon, 9 Oct 2023 16:10:35 +0000 (09:10 -0700)
committerKalle Valo <kvalo@kernel.org>
Thu, 12 Oct 2023 12:12:11 +0000 (15:12 +0300)
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 via CONFIG_UBSAN_BOUNDS (for
array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family
functions).

Add __counted_by for struct p54_cal_database.

Cc: Christian Lamparter <chunkeey@googlemail.com>
Cc: Kalle Valo <kvalo@kernel.org>
Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: linux-wireless@vger.kernel.org
Cc: linux-hardening@vger.kernel.org
Suggested-by: Jason Andryuk <jandryuk@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Jason Andryuk <jandryuk@gmail.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20231009161028.it.544-kees@kernel.org
drivers/net/wireless/intersil/p54/p54.h

index 3356ea708d81632732312e6f49add55847f1bdab..522656de415987232e6447fee92f1d25d9238c8b 100644 (file)
@@ -126,7 +126,7 @@ struct p54_cal_database {
        size_t entry_size;
        size_t offset;
        size_t len;
-       u8 data[];
+       u8 data[] __counted_by(len);
 };
 
 #define EEPROM_READBACK_LEN 0x3fc