Message ID | 20231003232704.work.596-kees@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2412837vqb; Tue, 3 Oct 2023 16:28:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFSuSQUMlV9zZQO6v2FIAe97S9IIBQMoCqZUyrl5UeexhNYbgjrRqGU8kihWCQrPDC01cY+ X-Received: by 2002:a05:6808:218d:b0:3a7:2690:94d5 with SMTP id be13-20020a056808218d00b003a7269094d5mr1291257oib.8.1696375690172; Tue, 03 Oct 2023 16:28:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696375690; cv=none; d=google.com; s=arc-20160816; b=T51U8JyNVAVeKLSJSwtSznHfXua1X2/kB+LR4cfYoy3g1dIN2x43184x0UGL3Rjqau g4bohKw0c5WlcN0IAA6exQrMF8k6p6Qf6Aw8xJMs/CzM9a1A2leSu2ei92Ao/VdesWr2 TpE9mKtHLR6Z6IIl8z/TLwf2ZeJw8x86YnrFagSwLt8BqTpYE53TZIBFvym8rRF82Nmx yjCw0P/j6QBiVlsmg2R59BZoYl9KFnoR0Zt/CnZdjNomG659sy1Gyfi2GFORKphIUxod i0YLe26CKZKpiTCMt/T3qWNIbghDS3fRR60ut3ASuvFy/8RH+VESRERWaIzmVOBbOMfM Dn2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=l1cocEZekiORqignw5iQ3QnO8ZAEe34D0CJMf8KTzIs=; fh=Zddljw77vXjeLvsLcIHAqIfP26CzXRuDWhDIrEZyWBI=; b=mCMEnI1lG6UxsCQ8BZ9GK8Qr7DsVWMZXL69/TTx+CoytpcKrbt/0YkXtFszHwTiGXn nPwgUQFtNioHScjKUdIfQlPY9MmRlwvceaWR1mim0zEZJGi9AkTIGaWtZDCm2I2glvS5 ukodYoYTWizx+hHo2eI7JGAwE9PhHCd0F49K0GcobJ+A33KJ+n8ZSS2oXizQSPsmTcZA BeGPsz09YYu7TkpvAfIX4NNoVQpHncDUlK6aXhrckvJ0uxAUSHVsR4TUd+oyCWOy9kmh /7BNVcdjEDeBZesMPThc1cH60nLEszwnkdpvIPZoAR0nhhD2FLHPdrJuaMwz/c52ldFv Co/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=kmkt1mje; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id i190-20020a6387c7000000b00589336ba9fcsi2439501pge.557.2023.10.03.16.28.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 16:28:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=kmkt1mje; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 731B481B94CC; Tue, 3 Oct 2023 16:28:09 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235337AbjJCX2I (ORCPT <rfc822;chrisfriedt@gmail.com> + 17 others); Tue, 3 Oct 2023 19:28:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234460AbjJCX2H (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 3 Oct 2023 19:28:07 -0400 Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D31CB0 for <linux-kernel@vger.kernel.org>; Tue, 3 Oct 2023 16:28:03 -0700 (PDT) Received: by mail-oi1-x231.google.com with SMTP id 5614622812f47-3af608eb367so990251b6e.2 for <linux-kernel@vger.kernel.org>; Tue, 03 Oct 2023 16:28:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696375682; x=1696980482; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=l1cocEZekiORqignw5iQ3QnO8ZAEe34D0CJMf8KTzIs=; b=kmkt1mjeshnqomFJXrb9VPO9h7KiUu+pNppPH5zsgOlumyN2gSxB2gN8n834+FlHas YyV+8ljv2oQrTAlAmNmy4xvuyeXbCDJMlJpGGmtHdRHgnersE0+gfz2D9bHXGHw2hVn6 FgtGoph3zItdFwAWwEIK+bNESIOC8wA+XtlFM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696375682; x=1696980482; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=l1cocEZekiORqignw5iQ3QnO8ZAEe34D0CJMf8KTzIs=; b=gA0hGbVio5GxFGoNPxJ0ISgudG4gjooH6MtdCAeqOOX29fuvRe2YeUh+1wFw+Bz5fv OZYPVASAiz7dI4mAVEQkc+EOmd2tZB8eyuFrLHFcEL7QX/TOvNEWvwgLYNaYFX1+4c1o 0UZfhhEManPOtO0LY1Kpv4hPLsQf23xEiFBWkF6FaeZUM++4biTQAmpdkAN+G6MDiEKo OtuF9wBgYJsSE5115jrXi+C9fWpyjDyH0LQe9Ch/xIkPxfQbBWLPqXr7GvL1SxHxZhLG S9jXY7aXnVYFw3iphh2ZLCvd6iGGuce15QvUypU31pDqspB4IAEoArYwTNiTrFOjO20b sZWQ== X-Gm-Message-State: AOJu0YwWCRVLT4P0Epl6r4fK+VB/OEU/bYpaiK55OSeAbP4FzaCwIMem rgSteJP0TRJK8EU9nIPtXCdNRQ== X-Received: by 2002:a05:6808:1386:b0:3ab:83fe:e18f with SMTP id c6-20020a056808138600b003ab83fee18fmr1040629oiw.35.1696375682763; Tue, 03 Oct 2023 16:28:02 -0700 (PDT) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id b2-20020a63a102000000b005637030d00csm1917249pgf.30.2023.10.03.16.28.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 16:28:02 -0700 (PDT) From: Kees Cook <keescook@chromium.org> To: Vinod Koul <vkoul@kernel.org> Cc: Kees Cook <keescook@chromium.org>, dmaengine@vger.kernel.org, "Gustavo A. R. Silva" <gustavoars@kernel.org>, Nathan Chancellor <nathan@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, Tom Rix <trix@redhat.com>, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH] dmaengine: fsl-edma: Annotate struct struct fsl_edma_engine with __counted_by Date: Tue, 3 Oct 2023 16:27:56 -0700 Message-Id: <20231003232704.work.596-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1156; i=keescook@chromium.org; h=from:subject:message-id; bh=s8UpsNSdXXPa2sG80VKv45a8RFcNlzZa7z4+aE1gKZA=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlHKN8cBMJPNyzXXuGAC8pBAjZvNoG6NrfePoLd C9D5gSb26qJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZRyjfAAKCRCJcvTf3G3A JuEJD/9v/LCGJzv4Rw87JT1vYJVt0ykGcqLmnwnqOBGGZsqevqD+b7qp14+O1Q8lnIkI4W33lG2 WbeXUWN6tcTbe2U5IZqKbtksxWFE9qY5jG44U0LWuYDitzIy3zpXoUzf9KKtH0MFHEZgbdcWT+v advfP2YT7lRageoZr5YdGugHBpNZ/jaZEB75Sbmm6rfce8egfMISd/JvRWzu5Vk1EszldbP1i9b X0VVdfiA4Ip9o7U//FK/Qhh+dHVNCeAxH8tjonoTn8VmX9dVq9kEIIlNdqdakhQ0cqotn8K+UUz TEg4oOAtEvyQFwLSSFJOWWrbwtEsZt/hyQKAZg0s7KrNXDkaRw2QJ+HfpOmnWnrZIEIcSeVSYxl ZG7UCCXQkpA+wJQ7/w/j53k+5e+LHjmnZgv9fkU9QVQs/NUCWMvaldXHJnVsUBfJ2Wsl464Pd6Q VDhJzr/ZMMATrkL4cRoZCmPBuJHtTFPoUDIiMmnFlZab82OB2xZ02UKYagv77ZurGq/O9vmzYdl 6D8O7BYvb1dlOYv/uEpQHR3PaTu2k+nq1RXhNk3opBHUl1hrke7gJEcsFF6ehvPQY2fvHgESw04 RR7Lmu9tmg7ilcDwH1bO92ixNm7NP1P8B30siaG24HjWBbalKHnxhHyQaO60ldjhBdlBVJ0wRGl /fnpHhl RpJmix4Q== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 03 Oct 2023 16:28:09 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778778835529033898 X-GMAIL-MSGID: 1778778835529033898 |
Series |
dmaengine: fsl-edma: Annotate struct struct fsl_edma_engine with __counted_by
|
|
Commit Message
Kees Cook
Oct. 3, 2023, 11:27 p.m. UTC
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 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 struct fsl_edma_engine.
Cc: Vinod Koul <vkoul@kernel.org>
Cc: dmaengine@vger.kernel.org
Link: https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1]
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/dma/fsl-edma-common.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On 10/4/23 01:27, 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 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 struct fsl_edma_engine. > > Cc: Vinod Koul <vkoul@kernel.org> > Cc: dmaengine@vger.kernel.org > Link: https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1] > Signed-off-by: Kees Cook <keescook@chromium.org> Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org> Thanks -- Gustavo > --- > drivers/dma/fsl-edma-common.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h > index 40d50cc3d75a..bb5221158a77 100644 > --- a/drivers/dma/fsl-edma-common.h > +++ b/drivers/dma/fsl-edma-common.h > @@ -225,7 +225,7 @@ struct fsl_edma_engine { > bool big_endian; > struct edma_regs regs; > u64 chan_masked; > - struct fsl_edma_chan chans[]; > + struct fsl_edma_chan chans[] __counted_by(n_chans); > }; > > #define edma_read_tcdreg(chan, __name) \
On Tue, 03 Oct 2023 16:27:56 -0700, 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 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 struct fsl_edma_engine. > > [...] Applied, thanks! [1/1] dmaengine: fsl-edma: Annotate struct struct fsl_edma_engine with __counted_by commit: c223bafdcbd51506df00509088efc62e08ef6c3f Best regards,
diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h index 40d50cc3d75a..bb5221158a77 100644 --- a/drivers/dma/fsl-edma-common.h +++ b/drivers/dma/fsl-edma-common.h @@ -225,7 +225,7 @@ struct fsl_edma_engine { bool big_endian; struct edma_regs regs; u64 chan_masked; - struct fsl_edma_chan chans[]; + struct fsl_edma_chan chans[] __counted_by(n_chans); }; #define edma_read_tcdreg(chan, __name) \