linux-kernel - [PATCH] mtd: rawnand: cadence: Annotate struct cdns_nand_chip 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: <20231006201734.work.060-kees@kernel.org>
Date:   Fri,  6 Oct 2023 13:17:34 -0700
From:   Kees Cook <keescook@...omium.org>
To:     Miquel Raynal <miquel.raynal@...tlin.com>
Cc:     Kees Cook <keescook@...omium.org>,
        Richard Weinberger <richard@....at>,
        Vignesh Raghavendra <vigneshr@...com>,
        "Gustavo A. R. Silva" <gustavoars@...nel.org>,
        Martin Blumenstingl <martin.blumenstingl@...glemail.com>,
        Nicolas Ferre <nicolas.ferre@...rochip.com>,
        Roger Quadros <rogerq@...nel.org>,
        Thierry Reding <treding@...dia.com>,
        Yang Yingliang <yangyingliang@...wei.com>,
        Uwe Kleine-König 
        <u.kleine-koenig@...gutronix.de>,
        Valentin Korenblit <vkorenblit@...uans.com>,
        ye xingchen <ye.xingchen@....com.cn>,
        linux-mtd@...ts.infradead.org, linux-hardening@...r.kernel.org,
        Nathan Chancellor <nathan@...nel.org>,
        Nick Desaulniers <ndesaulniers@...gle.com>,
        Tom Rix <trix@...hat.com>, Heiko Stuebner <heiko@...ech.de>,
        linux-kernel@...r.kernel.org, llvm@...ts.linux.dev
Subject: [PATCH] mtd: rawnand: cadence: Annotate struct cdns_nand_chip 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 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 cdns_nand_chip.

Cc: Miquel Raynal <miquel.raynal@...tlin.com>
Cc: Richard Weinberger <richard@....at>
Cc: Vignesh Raghavendra <vigneshr@...com>
Cc: "Gustavo A. R. Silva" <gustavoars@...nel.org>
Cc: Martin Blumenstingl <martin.blumenstingl@...glemail.com>
Cc: Nicolas Ferre <nicolas.ferre@...rochip.com>
Cc: Roger Quadros <rogerq@...nel.org>
Cc: Thierry Reding <treding@...dia.com>
Cc: Yang Yingliang <yangyingliang@...wei.com>
Cc: "Uwe Kleine-König" <u.kleine-koenig@...gutronix.de>
Cc: Valentin Korenblit <vkorenblit@...uans.com>
Cc: ye xingchen <ye.xingchen@....com.cn>
Cc: linux-mtd@...ts.infradead.org
Cc: linux-hardening@...r.kernel.org
Link: https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1]
Signed-off-by: Kees Cook <keescook@...omium.org>
---
 drivers/mtd/nand/raw/cadence-nand-controller.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/raw/cadence-nand-controller.c b/drivers/mtd/nand/raw/cadence-nand-controller.c
index 034ec564c2ed..7d5ef7ffe0fe 100644
--- a/drivers/mtd/nand/raw/cadence-nand-controller.c
+++ b/drivers/mtd/nand/raw/cadence-nand-controller.c
@@ -526,7 +526,7 @@ struct cdns_nand_chip {
 	/* ECC strength index. */
 	u8 corr_str_idx;
 
-	u8 cs[];
+	u8 cs[] __counted_by(nsels);
 };
 
 struct ecc_info {
-- 
2.34.1