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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1E66FC678DC for ; Fri, 18 Aug 2023 01:25:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=A/XGGRM1Ck9QGQGOhX0v5dIGuvNZ4zTYx0oqnMHKYBg=; b=I6DAXyXOTlzLu/ gnCOukf36i1/z1NrHbJEoz7SiDeQNYuJBXoDftkW5EXZeh7LetIC+NXsJM8NSEXwJJz2iQJBavoQa H0VVIsKxWObllB42jgQP0FBftJYBz6KTJDxiLpY90fZpwiCC2smNywFc+jmAJ8wJgiGnWUKraUHfJ rEjTBFpX+muSxQjSXsJbVH5dwcIA8ERq5536xkz6EZrfAGwnHu6wUkF2fwPWJnjG5c4bs7rQkfZWu fX7R5xvfxdm/i5pLpFl2hZlm66EfkNSCMjc/2PbC8NelKTAxSWZK00c19fZVIEMGSbUbHNAXuvdNd CDnygf6VRUK0MV6aWPPw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qWoE5-007TNV-0b; Fri, 18 Aug 2023 01:24:33 +0000 Received: from omta034.useast.a.cloudfilter.net ([44.202.169.33]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qWoE1-007Szd-31 for linux-arm-kernel@lists.infradead.org; Fri, 18 Aug 2023 01:24:31 +0000 Received: from eig-obgw-5009a.ext.cloudfilter.net ([10.0.29.176]) by cmsmtp with ESMTP id WmuKqo7imez0CWoDnqAtZP; Fri, 18 Aug 2023 01:24:15 +0000 Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with ESMTPS id WoE0qKhiE0LVOWoE1qo1il; Fri, 18 Aug 2023 01:24:29 +0000 X-Authority-Analysis: v=2.4 cv=BvCOfKb5 c=1 sm=1 tr=0 ts=64dec84d 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=PQxDlO0rh1wi_DnxKH8A: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=EwBdW62PPBMZVf78eVBfrCIfGvyXuF9Ofx4kjw6wwVU=; b=PINaxgXl8Chxqc5houvaG4bVzG KziTmKnq9L+37ydcZjmi5Az2P4nZyitbdg9RGfEoK8IwCtRVXPIqgL7AuCMPnevwzdnfu8rfp0Kjx UFOllsZDWvTfaa8AlsylGuKEdMMpFOJ5/01nXxZWTTr7hYqIM+Dz5jgGrkuCfmgEn9Kafr1xkwe8K F9v2e4iKqRl1v0Z5AhLucqAev4X7YlwK+ju2EhtgfZdyMFg73VaOGEwKn3vslu+/gZws2AOEuMZCH hpgY+ywIBBXq4XGyRIzjT+7NHCZWaeGKBZRFCt8THw/ZoOXDtOK2rGheOvfKhW5jLWroXKWhTjhHC oCAH982w==; Received: from 187-162-21-192.static.axtel.net ([187.162.21.192]:55258 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 1qWoDy-000XHo-0J; Thu, 17 Aug 2023 20:24:26 -0500 Message-ID: Date: Thu, 17 Aug 2023 19:25:24 -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 12/21] dmaengine: stm32-dma: Annotate struct stm32_dma_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-12-keescook@chromium.org> From: "Gustavo A. R. Silva" In-Reply-To: <20230817235859.49846-12-keescook@chromium.org> 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 - lists.infradead.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: 1qWoDy-000XHo-0J 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]:55258 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 414 X-Org: HG=hgshared;ORG=hostgator; X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfOiA8iThgBA5wmuhHcNf6C99jPmcJ3tuxEQpLW9S3687bC4tl+TbdeqO4EvLITZ8ExDodAPzousbyI59PcpfSWXrvp7gyDa9KO4c8HSBHZEw6UTTMjpU XNu1VX9OpROYVAJT/w1tFgMipMwFP7O0ux+MkP8t4BQYmifuSh55szR3SujAu7/iCYygo16tLEqmReFzmDwp1Q2E5MKniYph5jjaxtFcyS0OTWeIogNXucV5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230817_182430_041892_9127C5D0 X-CRM114-Status: GOOD ( 15.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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_dma_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-dma.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/drivers/dma/stm32-dma.c b/drivers/dma/stm32-dma.c > index 5c36811aa134..a732b3807b11 100644 > --- a/drivers/dma/stm32-dma.c > +++ b/drivers/dma/stm32-dma.c > @@ -191,7 +191,7 @@ struct stm32_dma_desc { > struct virt_dma_desc vdesc; > bool cyclic; > u32 num_sgs; > - struct stm32_dma_sg_req sg_req[]; > + struct stm32_dma_sg_req sg_req[] __counted_by(num_sgs); > }; > > /** > @@ -1105,6 +1105,7 @@ static struct dma_async_tx_descriptor *stm32_dma_prep_slave_sg( > desc = kzalloc(struct_size(desc, sg_req, sg_len), GFP_NOWAIT); > if (!desc) > return NULL; > + desc->num_sgs = sg_len; > > /* Set peripheral flow controller */ > if (chan->dma_sconfig.device_fc) > @@ -1141,8 +1142,6 @@ static struct dma_async_tx_descriptor *stm32_dma_prep_slave_sg( > desc->sg_req[i].chan_reg.dma_sm1ar += sg_dma_len(sg); > desc->sg_req[i].chan_reg.dma_sndtr = nb_data_items; > } > - > - desc->num_sgs = sg_len; > desc->cyclic = false; > > return vchan_tx_prep(&chan->vchan, &desc->vdesc, flags); > @@ -1216,6 +1215,7 @@ static struct dma_async_tx_descriptor *stm32_dma_prep_dma_cyclic( > desc = kzalloc(struct_size(desc, sg_req, num_periods), GFP_NOWAIT); > if (!desc) > return NULL; > + desc->num_sgs = num_periods; > > for (i = 0; i < num_periods; i++) { > desc->sg_req[i].len = period_len; > @@ -1232,8 +1232,6 @@ static struct dma_async_tx_descriptor *stm32_dma_prep_dma_cyclic( > if (!chan->trig_mdma) > buf_addr += period_len; > } > - > - desc->num_sgs = num_periods; > desc->cyclic = true; > > return vchan_tx_prep(&chan->vchan, &desc->vdesc, flags); > @@ -1254,6 +1252,7 @@ static struct dma_async_tx_descriptor *stm32_dma_prep_dma_memcpy( > desc = kzalloc(struct_size(desc, sg_req, num_sgs), GFP_NOWAIT); > if (!desc) > return NULL; > + desc->num_sgs = num_sgs; > > threshold = chan->threshold; > > @@ -1283,8 +1282,6 @@ static struct dma_async_tx_descriptor *stm32_dma_prep_dma_memcpy( > desc->sg_req[i].chan_reg.dma_sndtr = xfer_count; > desc->sg_req[i].len = xfer_count; > } > - > - desc->num_sgs = num_sgs; > desc->cyclic = false; > > return vchan_tx_prep(&chan->vchan, &desc->vdesc, flags); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel