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 1D1F8C2FC0E for ; Fri, 18 Aug 2023 01:29:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352552AbjHRB3O (ORCPT ); Thu, 17 Aug 2023 21:29:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357083AbjHRB2t (ORCPT ); Thu, 17 Aug 2023 21:28:49 -0400 Received: from omta34.uswest2.a.cloudfilter.net (omta34.uswest2.a.cloudfilter.net [35.89.44.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B42C13ABA for ; Thu, 17 Aug 2023 18:28:26 -0700 (PDT) Received: from eig-obgw-6001a.ext.cloudfilter.net ([10.0.30.140]) by cmsmtp with ESMTP id WmuJqzgIKfaVXWoEHqSMX2; Fri, 18 Aug 2023 01:24:45 +0000 Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with ESMTPS id WoEHqBYmUyB3AWoEHqKQYA; Fri, 18 Aug 2023 01:24:45 +0000 X-Authority-Analysis: v=2.4 cv=UZlC9YeN c=1 sm=1 tr=0 ts=64dec85d a=1YbLdUo/zbTtOZ3uB5T3HA==:117 a=WzbPXH4gqzPVN0x6HrNMNA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10 a=UttIx32zK-AA:10 a=wYkD_t78qR0A:10 a=NEAV23lmAAAA:8 a=VwQbUJbxAAAA:8 a=pGLkceISAAAA:8 a=8b9GpE9nAAAA:8 a=phlkwaE_AAAA:8 a=JfrnYn6hAAAA:8 a=cm27Pg_UAAAA:8 a=qjWHau5h7Oqj65Zv8QkA:9 a=QEXdDO2ut3YA:10 a=AjGcO6oz07-iQ99wixmX:22 a=T3LWEMljR5ZiDmsYVIUa:22 a=uKTQOUHymn4LaG7oTSIC:22 a=1CNFftbPRP8L7MoqJWF3: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=AqieMOIgktxvBo8GBaNhs4Rq0vAOt4KL0VhES5aYsCM=; b=K1zZu/5hYlyfu/445Kt5jUu61c 2n+YMmumLFyMUGsx2R6zrgIH90c8OeFQfPPlCtYkmPuD1kdYaBKL8AmSbbC09aYuoDUYX5KgBVpBw +Glqy434Dp3KX8eJNc5xhy3rUq9P+pGo+dtQ1PRDMLKOW5lPPspAbrRi2aN4IiVUT3eMSP1Wjuuze P5ZlknrUfMB3D6galG8FjDa4fAexxvT2FN79vkZ0D+fTibDzuBC51y2QI09OIXWjA7gx18kDhaNpe DYn5z5vK/oRMOg57ZbqEe+xkZLEj17g+AoboD7/OxSDK9wWHgIR2GeFohwSsaXkUYOxXCu+xfp4xC njZ1SmWw==; Received: from 187-162-21-192.static.axtel.net ([187.162.21.192]:42946 helo=[192.168.15.8]) by gator4166.hostgator.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.96) (envelope-from ) id 1qWoEB-000XeZ-0x; Thu, 17 Aug 2023 20:24:39 -0500 Message-ID: <37a8baae-02da-9a1a-2a02-d63f9e212aa1@embeddedor.com> Date: Thu, 17 Aug 2023 19:25:38 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH 13/21] dmaengine: stm32-mdma: Annotate struct stm32_mdma_desc with __counted_by Content-Language: en-US To: Kees Cook , Vinod Koul Cc: Maxime Coquelin , Alexandre Torgue , dmaengine@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, Hector Martin , Sven Peter , Alyssa Rosenzweig , Ludovic Desroches , Tudor Ambarus , Lars-Peter Clausen , Zhou Wang , Jie Hai , Andy Gross , Bjorn Andersson , Konrad Dybcio , Green Wan , Orson Zhai , Baolin Wang , Chunyan Zhang , Patrice Chotard , Laxman Dewangan , Jon Hunter , Thierry Reding , Peter Ujfalusi , Kunihiko Hayashi , Masami Hiramatsu , Yu Kuai , Greg Kroah-Hartman , Jordy Zomer , Jernej Skrabec , Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, asahi@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-tegra@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org References: <20230817235428.never.111-kees@kernel.org> <20230817235859.49846-13-keescook@chromium.org> From: "Gustavo A. R. Silva" In-Reply-To: <20230817235859.49846-13-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: 187.162.21.192 X-Source-L: No X-Exim-ID: 1qWoEB-000XeZ-0x X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 187-162-21-192.static.axtel.net ([192.168.15.8]) [187.162.21.192]:42946 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 423 X-Org: HG=hgshared;ORG=hostgator; X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfNDl0vx9VkzMHEpiYtm9Tw/lw0riqQOzAeQPbE1kmw7dfuFe6PPDFMknxvIHkm3l+Ci9gjbIkok8BVt4BpV/oIW+hAY0G5ItH2nPxhwoxST9aw9psF1w twCGURwXRJqrIeRlxVqwdYudSJwMH/dLUC9knN4C5pd9qxcYs8P+ZM7owVhDm/hKJi2qEPh1WNNTN7A6vnG2cASL2FXqh+GvRu117Ir7baMOGmCHDXIRUriS Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org On 8/17/23 17:58, 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 stm32_mdma_desc. > Additionally, since the element count member must be set before accessing > the annotated flexible array member, move its initialization earlier. > > [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci > > Cc: Vinod Koul > Cc: Maxime Coquelin > Cc: Alexandre Torgue > Cc: dmaengine@vger.kernel.org > Cc: linux-stm32@st-md-mailman.stormreply.com > Cc: linux-arm-kernel@lists.infradead.org > Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Thanks -- Gustavo > --- > drivers/dma/stm32-mdma.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/dma/stm32-mdma.c b/drivers/dma/stm32-mdma.c > index 0de234022c6d..926d6ecf1274 100644 > --- a/drivers/dma/stm32-mdma.c > +++ b/drivers/dma/stm32-mdma.c > @@ -224,7 +224,7 @@ struct stm32_mdma_desc { > u32 ccr; > bool cyclic; > u32 count; > - struct stm32_mdma_desc_node node[]; > + struct stm32_mdma_desc_node node[] __counted_by(count); > }; > > struct stm32_mdma_dma_config { > @@ -321,6 +321,7 @@ static struct stm32_mdma_desc *stm32_mdma_alloc_desc( > desc = kzalloc(struct_size(desc, node, count), GFP_NOWAIT); > if (!desc) > return NULL; > + desc->count = count; > > for (i = 0; i < count; i++) { > desc->node[i].hwdesc = > @@ -330,8 +331,6 @@ static struct stm32_mdma_desc *stm32_mdma_alloc_desc( > goto err; > } > > - desc->count = count; > - > return desc; > > err: