From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E87ABE748ED for ; Sun, 1 Oct 2023 06:33:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234341AbjJAGdq (ORCPT ); Sun, 1 Oct 2023 02:33:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233320AbjJAGdo (ORCPT ); Sun, 1 Oct 2023 02:33:44 -0400 Received: from omta40.uswest2.a.cloudfilter.net (omta40.uswest2.a.cloudfilter.net [35.89.44.39]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D72F39F for ; Sat, 30 Sep 2023 23:33:41 -0700 (PDT) Received: from eig-obgw-6004a.ext.cloudfilter.net ([10.0.30.197]) by cmsmtp with ESMTP id mdm9q0gX3QUgRmq1MqbtHR; Sun, 01 Oct 2023 06:33:40 +0000 Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with ESMTPS id mq1LqLN5oRPlHmq1LqLHYF; Sun, 01 Oct 2023 06:33:39 +0000 X-Authority-Analysis: v=2.4 cv=ILARtyjG c=1 sm=1 tr=0 ts=651912c3 a=1YbLdUo/zbTtOZ3uB5T3HA==:117 a=P7XfKmiOJ4/qXqHZrN7ymg==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10 a=bhdUkHdE2iEA:10 a=wYkD_t78qR0A:10 a=NEAV23lmAAAA:8 a=AGRr4plBAAAA:8 a=J1Y8HTJGAAAA:8 a=1XWaLZrsAAAA:8 a=VwQbUJbxAAAA:8 a=20KFwNOVAAAA:8 a=cm27Pg_UAAAA:8 a=1wfVGpDdhcGxkbiBJp0A:9 a=QEXdDO2ut3YA:10 a=bOnWt3ThIoLzEnqt84vq:22 a=y1Q9-5lHfBjTkpIzbSAN:22 a=AjGcO6oz07-iQ99wixmX:22 a=xmb-EsYY8bH0VWELuYED:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=embeddedor.com; s=default; h=Content-Transfer-Encoding:Content-Type: In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=DrXa2rG6dSCIyhFViMvKaxN9ZljtEbXXYtJDNmxhFcI=; b=rA0c4/TQzJTvID0G+vnwo8cTWP 247fmP7DGX+RGqHLGzelXVmgqGgwO/N74BuoNGXyKQlXf53/pll05f9d05i4Rae0WbxnMY9oNZglZ jZXRz4mWqZhFwrQVCYqjNpTwmcZ9/eYJRfIJnPCE3G5scqoGWV80KDNjorrS4OcTPVfAGsvIBnaMN u31d6w4tiTLyknlBsshptooe+/TFDF0H3uc7rgpKSKyDKFJCyTODlNFoXgPWbud/ldzO2awUB4jzs E6lMvCcFZzfpUAohT9Frt6M7mwRmqRz8hq22Ht3zDCDIDlSknfd9Yn+R5rsbWQ2Tro8bV9fFPOoJY /M6lQPpQ==; Received: from [94.239.20.48] (port=58074 helo=[192.168.1.98]) by gator4166.hostgator.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.96) (envelope-from ) id 1qmq1J-001HC8-0v; Sun, 01 Oct 2023 01:33:37 -0500 Message-ID: <2a8c5d4f-8404-3198-da8a-ba341609aeb1@embeddedor.com> Date: Sun, 1 Oct 2023 08:33:28 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: [PATCH 1/5] chelsio/l2t: Annotate struct l2t_data with __counted_by Content-Language: en-US To: Kees Cook , Raju Rangoju Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, "Gustavo A. R. Silva" , Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, llvm@lists.linux.dev References: <20230929181042.work.990-kees@kernel.org> <20230929181149.3006432-1-keescook@chromium.org> From: "Gustavo A. R. Silva" In-Reply-To: <20230929181149.3006432-1-keescook@chromium.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4166.hostgator.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - embeddedor.com X-BWhitelist: no X-Source-IP: 94.239.20.48 X-Source-L: No X-Exim-ID: 1qmq1J-001HC8-0v X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: ([192.168.1.98]) [94.239.20.48]:58074 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 3 X-Org: HG=hgshared;ORG=hostgator; X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfFuimF1OCBJV53+tfv/ctGmnGWegALDFHUY78TvgfbO8hfUzvQdp3vuQyzGKoKV98YUprfQx4wX8TNcHFxxn4l0nB7BsnV7b4e0DDhH9uq8ZkHVDHrKj G9ia+BOA29GxSp+ZbT0nlIcTqGmVZ2vKzGta05I0/KEk3ztYt83dWdkZgRwAVvS3rLcMUMHEmFZCHS+GQ3b6yXGItapbL6v8OUcu9A/DAzD/0bzzmrQtGE1N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 9/29/23 20:11, Kees Cook wrote: > 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 l2t_data. > > [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci > > Cc: Raju Rangoju > Cc: "David S. Miller" > Cc: Eric Dumazet > Cc: Jakub Kicinski > Cc: Paolo Abeni > Cc: netdev@vger.kernel.org > Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Thanks -- Gustavo > --- > drivers/net/ethernet/chelsio/cxgb3/l2t.h | 2 +- > drivers/net/ethernet/chelsio/cxgb4/l2t.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h > index ea75f275023f..646ca0bc25bd 100644 > --- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h > +++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h > @@ -76,7 +76,7 @@ struct l2t_data { > atomic_t nfree; /* number of free entries */ > rwlock_t lock; > struct rcu_head rcu_head; /* to handle rcu cleanup */ > - struct l2t_entry l2tab[]; > + struct l2t_entry l2tab[] __counted_by(nentries); > }; > > typedef void (*arp_failure_handler_func)(struct t3cdev * dev, > diff --git a/drivers/net/ethernet/chelsio/cxgb4/l2t.c b/drivers/net/ethernet/chelsio/cxgb4/l2t.c > index a10a6862a9a4..1e5f5b1a22a6 100644 > --- a/drivers/net/ethernet/chelsio/cxgb4/l2t.c > +++ b/drivers/net/ethernet/chelsio/cxgb4/l2t.c > @@ -59,7 +59,7 @@ struct l2t_data { > rwlock_t lock; > atomic_t nfree; /* number of free entries */ > struct l2t_entry *rover; /* starting point for next allocation */ > - struct l2t_entry l2tab[]; /* MUST BE LAST */ > + struct l2t_entry l2tab[] __counted_by(l2t_size); /* MUST BE LAST */ > }; > > static inline unsigned int vlan_prio(const struct l2t_entry *e)