linux-hardening - [PATCH] platform/chrome: wilco_ec: Annotate struct ec_event_queue with __counted

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20230922175146.work.219-kees@kernel.org>
Date: Fri, 22 Sep 2023 10:51:47 -0700
From: Kees Cook <keescook@...omium.org>
To: Benson Leung <bleung@...omium.org>
Cc: Kees Cook <keescook@...omium.org>,
	Tzung-Bi Shih <tzungbi@...nel.org>,
	Dawei Li <set_pte_at@...look.com>,
	Dmitry Torokhov <dmitry.torokhov@...il.com>,
	Maximilian Luz <luzmaximilian@...il.com>,
	Uwe Kleine-König <u.kleine-koenig@...gutronix.de>,
	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Jiang Jian <jiangjian@...rlc.com>,
	chrome-platform@...ts.linux.dev,
	Nathan Chancellor <nathan@...nel.org>,
	Nick Desaulniers <ndesaulniers@...gle.com>,
	Tom Rix <trix@...hat.com>,
	Hans de Goede <hdegoede@...hat.com>,
	Lee Jones <lee@...nel.org>,
	linux-kernel@...r.kernel.org,
	llvm@...ts.linux.dev,
	linux-hardening@...r.kernel.org
Subject: [PATCH] platform/chrome: wilco_ec: Annotate struct ec_event_queue 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 ec_event_queue.

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

Cc: Benson Leung <bleung@...omium.org>
Cc: Tzung-Bi Shih <tzungbi@...nel.org>
Cc: Dawei Li <set_pte_at@...look.com>
Cc: Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc: Maximilian Luz <luzmaximilian@...il.com>
Cc: "Uwe Kleine-König" <u.kleine-koenig@...gutronix.de>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: Jiang Jian <jiangjian@...rlc.com>
Cc: chrome-platform@...ts.linux.dev
Signed-off-by: Kees Cook <keescook@...omium.org>
---
 drivers/platform/chrome/wilco_ec/event.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/chrome/wilco_ec/event.c b/drivers/platform/chrome/wilco_ec/event.c
index a40f60bcefb6..f80a7c83cfba 100644
--- a/drivers/platform/chrome/wilco_ec/event.c
+++ b/drivers/platform/chrome/wilco_ec/event.c
@@ -95,7 +95,7 @@ struct ec_event_queue {
 	int capacity;
 	int head;
 	int tail;
-	struct ec_event *entries[];
+	struct ec_event *entries[] __counted_by(capacity);
 };
 
 /* Maximum number of events to store in ec_event_queue */
-- 
2.34.1