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 677E1C7113B for ; Fri, 18 Aug 2023 03:20:20 +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=vxuQPJQLULAhEAYQvCWx1p1FH4Uh3E4W9/fViv4R+mQ=; b=elG5/T3inYuhNQ /fPcHjdZNH4FfgSo5DW5iI5wa1TNydOGC6r/ovhWc9u/AWPHPV92f6xnBLCkNIr0z3fdfBnPWOtsz 5vGDR19LcIzb6c+UQKbJyLW8kPMJnkG+Hzyrrh4a4ZKlJ1aaFqjC3n4/w0mX7JWhB5az9BF+eQjSD SAAnS+D9FOT0i9swyo4Fyno/wpIghDtH71lgOtBdYB+1mNityjAFNxIanTe15HLfZ7h498utjOy6g iwbqBToGU3PGG3mB33un4bAcXcHy9H6E3Ow+BAtwUgjeCpGftU70OkMAu7RSZQpUcto771Lr3VNdW Voc1cTPLDDGWcbCWVWJQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qWq1g-007b4A-0n; Fri, 18 Aug 2023 03:19:52 +0000 Received: from omta036.useast.a.cloudfilter.net ([44.202.169.35]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qWq1c-007b3k-1X for linux-arm-kernel@lists.infradead.org; Fri, 18 Aug 2023 03:19:50 +0000 Received: from eig-obgw-5006a.ext.cloudfilter.net ([10.0.29.179]) by cmsmtp with ESMTP id WmuJqHTj7DKaKWq1XqKpRq; Fri, 18 Aug 2023 03:19:43 +0000 Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with ESMTPS id Wq1Wq9Z7hHSofWq1Xq2mfu; Fri, 18 Aug 2023 03:19:43 +0000 X-Authority-Analysis: v=2.4 cv=HbEH8wI8 c=1 sm=1 tr=0 ts=64dee34f 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=c-n4J4-pAAAA:8 a=JfrnYn6hAAAA:8 a=cm27Pg_UAAAA:8 a=qjWHau5h7Oqj65Zv8QkA:9 a=QEXdDO2ut3YA:10 a=AjGcO6oz07-iQ99wixmX:22 a=L0NDqeB7ZLmQzAogN4cw: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=sQ30Ovr09Lgt/qeIl/nptDbt/kIRZBZ47Tzj0AxpNF0=; b=l2vTi2kOVga2bMsCnBTxK/Kkr2 zBfV8oMnGXhoeZeYL01VY59r8sDSAxwET73X/K0vn5vOyPtFhe6CDcYOGRpcnZ3L9ZD2JVVEtVOGr dqs9JJ3sq6zbIhsh0ZFoYtAuWu0OWc7A6jN0PS4e7T7GIkc+NSnfNgqNNguHCuk/74dp6Rf+8HEVt VUwxza1nVVEMfKe+1fCBvxf1iX/0DpiOyN1H/q+dDIpSjxaq77fVmM2KshKizL64+SBbmikVyi2Ag v704SB3dDffPxyyOZ99OjFxKjnnUnGdDS8RSccxVM2Hf1ntVMHJZ3+Wg2B/k4toOqJv2xopf+CVeM DCAwUjDg==; Received: from 187-162-21-192.static.axtel.net ([187.162.21.192]:53190 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 1qWp0s-001Dea-1q; Thu, 17 Aug 2023 21:14:58 -0500 Message-ID: <3afdda82-052b-69fc-02d8-ef4a9670e481@embeddedor.com> Date: Thu, 17 Aug 2023 20:15:57 -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 19/21] dmaengine: uniphier-xdmac: Annotate struct uniphier_xdmac_desc with __counted_by Content-Language: en-US To: Kees Cook , Vinod Koul Cc: Kunihiko Hayashi , Masami Hiramatsu , dmaengine@vger.kernel.org, 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 , Maxime Coquelin , Alexandre Torgue , Laxman Dewangan , Jon Hunter , Thierry Reding , Peter Ujfalusi , 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-stm32@st-md-mailman.stormreply.com, linux-tegra@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org References: <20230817235428.never.111-kees@kernel.org> <20230817235859.49846-19-keescook@chromium.org> From: "Gustavo A. R. Silva" In-Reply-To: <20230817235859.49846-19-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: 1qWp0s-001Dea-1q 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]:53190 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 0 X-Org: HG=hgshared;ORG=hostgator; X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfO+8XD+ONc7uGxwNkW+Gx3agpoJ+PovAnvBS1VLMvnaWdEQEooL3nP7HB7X29sVx/FHuUXyqxSS/nBHuFBwjhLBbWgwD3iOZuwRyIPTaQRLtPYfWPjvT 8ud5GHeV6/wjNMVVjk72zs0fb3TTxJSl4lSfuOB7/m1iNMQoHPxEY6vmk3qlixq2UPIFzeeso3ZSGtX68O5IuRlEJVmw/1K0KAdnFNPLfyVPVu2fgoaArwtu X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230817_201948_583706_A0CC4AEF X-CRM114-Status: GOOD ( 15.41 ) 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 uniphier_xdmac_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: Kunihiko Hayashi > Cc: Masami Hiramatsu > Cc: dmaengine@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Thanks -- Gustavo > --- > drivers/dma/uniphier-xdmac.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/dma/uniphier-xdmac.c b/drivers/dma/uniphier-xdmac.c > index 290836b7e1be..dd51522879a7 100644 > --- a/drivers/dma/uniphier-xdmac.c > +++ b/drivers/dma/uniphier-xdmac.c > @@ -80,7 +80,7 @@ struct uniphier_xdmac_desc { > unsigned int nr_node; > unsigned int cur_node; > enum dma_transfer_direction dir; > - struct uniphier_xdmac_desc_node nodes[]; > + struct uniphier_xdmac_desc_node nodes[] __counted_by(nr_node); > }; > > struct uniphier_xdmac_chan { > @@ -295,6 +295,7 @@ uniphier_xdmac_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dst, > xd = kzalloc(struct_size(xd, nodes, nr), GFP_NOWAIT); > if (!xd) > return NULL; > + xd->nr_node = nr; > > for (i = 0; i < nr; i++) { > burst_size = min_t(size_t, len, XDMAC_MAX_WORD_SIZE); > @@ -309,7 +310,6 @@ uniphier_xdmac_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dst, > } > > xd->dir = DMA_MEM_TO_MEM; > - xd->nr_node = nr; > xd->cur_node = 0; > > return vchan_tx_prep(vc, &xd->vd, flags); > @@ -351,6 +351,7 @@ uniphier_xdmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, > xd = kzalloc(struct_size(xd, nodes, sg_len), GFP_NOWAIT); > if (!xd) > return NULL; > + xd->nr_node = sg_len; > > for_each_sg(sgl, sg, sg_len, i) { > xd->nodes[i].src = (direction == DMA_DEV_TO_MEM) > @@ -385,7 +386,6 @@ uniphier_xdmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, > } > > xd->dir = direction; > - xd->nr_node = sg_len; > xd->cur_node = 0; > > return vchan_tx_prep(vc, &xd->vd, flags); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel