From: Kees Cook <keescook@chromium.org>
Date: Fri, 22 Sep 2023 17:52:11 +0000 (-0700)
Subject: ata: libata: Annotate struct ata_cpr_log with __counted_by
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0e19548145d863c48c6562add768a05231d768c9;p=linux.git

ata: libata: Annotate struct ata_cpr_log with __counted_by

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

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

Cc: Damien Le Moal <dlemoal@kernel.org>
Cc: linux-ide@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
---

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 54a217868ad0a..b398913202718 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -656,7 +656,7 @@ struct ata_cpr {
 
 struct ata_cpr_log {
 	u8			nr_cpr;
-	struct ata_cpr		cpr[];
+	struct ata_cpr		cpr[] __counted_by(nr_cpr);
 };
 
 struct ata_device {