linux-kernel - [PATCH 6/7] IB/mthca: Annotate struct mthca_icm_table 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-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20230929180431.3005464-6-keescook@chromium.org>
Date:   Fri, 29 Sep 2023 11:04:29 -0700
From:   Kees Cook <keescook@...omium.org>
To:     Jason Gunthorpe <jgg@...pe.ca>
Cc:     Kees Cook <keescook@...omium.org>,
        Leon Romanovsky <leon@...nel.org>, linux-rdma@...r.kernel.org,
        Dennis Dalessandro <dennis.dalessandro@...nelisnetworks.com>,
        Håkon Bugge <haakon.bugge@...cle.com>,
        Avihai Horon <avihaih@...dia.com>,
        Anand Khoje <anand.a.khoje@...cle.com>,
        Mark Bloch <mbloch@...dia.com>,
        Christian Benvenuti <benve@...co.com>,
        Nelson Escobar <neescoba@...co.com>,
        Bernard Metzler <bmt@...ich.ibm.com>,
        Bart Van Assche <bvanassche@....org>,
        "Gustavo A. R. Silva" <gustavoars@...nel.org>,
        Nathan Chancellor <nathan@...nel.org>,
        Nick Desaulniers <ndesaulniers@...gle.com>,
        Tom Rix <trix@...hat.com>,
        Patrisious Haddad <phaddad@...dia.com>,
        Chuck Lever <chuck.lever@...cle.com>,
        Tom Talpey <tom@...pey.com>,
        wangjianli <wangjianli@...rlc.com>, linux-kernel@...r.kernel.org,
        linux-hardening@...r.kernel.org, llvm@...ts.linux.dev
Subject: [PATCH 6/7] IB/mthca: Annotate struct mthca_icm_table 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 mthca_icm_table.

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

Cc: Jason Gunthorpe <jgg@...pe.ca>
Cc: Leon Romanovsky <leon@...nel.org>
Cc: linux-rdma@...r.kernel.org
Signed-off-by: Kees Cook <keescook@...omium.org>
---
 drivers/infiniband/hw/mthca/mthca_memfree.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.h b/drivers/infiniband/hw/mthca/mthca_memfree.h
index f9a2e65e2ff5..61d5bbba293a 100644
--- a/drivers/infiniband/hw/mthca/mthca_memfree.h
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.h
@@ -68,7 +68,7 @@ struct mthca_icm_table {
 	int               lowmem;
 	int               coherent;
 	struct mutex      mutex;
-	struct mthca_icm *icm[];
+	struct mthca_icm *icm[] __counted_by(num_icm);
 };
 
 struct mthca_icm_iter {
-- 
2.34.1