From patchwork Thu Sep 28 23:43:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 146427 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3811356vqu; Thu, 28 Sep 2023 23:10:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEZyCduGL9K0YWjBZWLhtiBEiIJBgDGjgaxLGDEG3EWfLbz7FnPPvLb66UvBBngGmSI+D7Z X-Received: by 2002:a05:6870:4612:b0:1d0:d68d:511 with SMTP id z18-20020a056870461200b001d0d68d0511mr3475763oao.49.1695967809296; Thu, 28 Sep 2023 23:10:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695967809; cv=none; d=google.com; s=arc-20160816; b=T+1SzlNagzAVNhUET6eBp/IC6e6lvDFci/8ovpPEibpXRtKq3G1ifLDMOp/dKA2ba4 LpogNOwXqma4f/EHEUXbMK3xoAsvFEM7T/N7xhkHQRYuLPeJKqRyB3Xl0BvF/DT+1GUz JNctOh9aPVFnWq6gVqSAiuvNQrxaq+3kWHbFCT7GUZhiP7DaFctgct1b6+LVKszi26y6 6EhkvKQFXihhwcaMH15mI7xe6vq5KCF9tiS87YLL+TcmlChF53gb5J3/DD1NVXWRnMB6 ceIq2VBLlDlGlCbfAUw4IJt5BSft7isaMkpVRFgNrzflS4BLbgRK40RCZIJ8x7lFr6DF ov/A== 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=MNHH+1qhuM2be0FNxraZa2k964UVjBr3da8cdiKRngw=; fh=OAuUqBKABs5Hpj1e4fKpeCC8Pn6/EGgzvcA7r/e5bhc=; b=jOv38eJwdvD+yypJMgT3clatdQlAfKlAfqhowTIgf7I7JBovy+usX8rsEeh1sRHGRn us+7stzX5PX50BypK1gOaT8JbYDVlSWD0oEnt0V5vfrpBTw/aUOly8qMshYQVH/apQ+u 2T/oWQFuqdffzYDWbIPd8CkyOtbPttzvEq7d27Wcsng2puzGoQyvM6JNTc7CK9CUt5Vw QNbN5QJHLUowlNB3fGWRi5VxBrsJqyIc3SzyFcbmbKD3ejXuj03I+bRzD1rGQkM14xkE x4pfSrt7er4wnUhj7uDKcviBBgbU0daTG7VPOXk4GoS353xVD5TbvOTMBywxy+yQcBaL Do7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Sy1qrqyW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id 63-20020a630142000000b00578a98c0687si21425989pgb.99.2023.09.28.23.10.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 23:10:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Sy1qrqyW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 0600982FCEA7; Thu, 28 Sep 2023 16:44:05 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231542AbjI1Xns (ORCPT + 21 others); Thu, 28 Sep 2023 19:43:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229653AbjI1Xnr (ORCPT ); Thu, 28 Sep 2023 19:43:47 -0400 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A0A219C for ; Thu, 28 Sep 2023 16:43:45 -0700 (PDT) Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1c1e3a4a06fso102285895ad.3 for ; Thu, 28 Sep 2023 16:43:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695944625; x=1696549425; 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=MNHH+1qhuM2be0FNxraZa2k964UVjBr3da8cdiKRngw=; b=Sy1qrqyWxjWf+WyGsozkx32322B0DYBkvwFZER87pdVzcNV/cugNLl7M2HVu3Id8wy ERRRlCOX2YAY3RHcV+ZcuTACBHNDMra7WDiN2NDRA6MVpbkl2R45j5Qrq3lx/wwbbfmL dI6/sb5rjwNXMlDbeoUO46Q6SL6U/J8Ldl814= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695944625; x=1696549425; 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=MNHH+1qhuM2be0FNxraZa2k964UVjBr3da8cdiKRngw=; b=tI/yeCkGB0gmPlkdl+Qq4iLRFES4UsHfXlsY45Z/Fo/zWaWzh4Qn6+kL1wjgU5DFCf UIJdQGzH/tyJsYUXWpf5Qo6czELGS7ZS04bApBVXP5gOt/6K9rkll5H2WkqEr7u5N0yo V8+OLHqWpcrvcTQHh1EErZRis/CC/j/pVPiS69yWOCx62qQeyLR4iW2lbZnJWNTyXRtk L4wG+Qe++iUaQD0SRlWjvYRv63kosAr7SDLme9N56FeMpZGutwKr3cBh9R2F+ssHolCc 15FO5CenEYkNLTWTx381DQy9qKqwErWOrBLsRWKl7seIDbBRgALxoYWlGvsKizU8dIaY cU0w== X-Gm-Message-State: AOJu0YwJJcRuSLV5EYdZ04aIJFFQNoFM8qfBCla2axOu2Lu4q1//si8k QaI+Kpofy8pgkGcCwQvstUXE2w== X-Received: by 2002:a17:903:1c1:b0:1c4:638:fff4 with SMTP id e1-20020a17090301c100b001c40638fff4mr2370744plh.17.1695944624781; Thu, 28 Sep 2023 16:43:44 -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 s10-20020a170902ea0a00b001b895336435sm4068006plg.21.2023.09.28.16.43.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 16:43:44 -0700 (PDT) From: Kees Cook To: Vinod Koul Cc: Kees Cook , Nathan Chancellor , Nick Desaulniers , Tom Rix , dmaengine@vger.kernel.org, llvm@lists.linux.dev, "Gustavo A. R. Silva" , linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH] dmaengine: ep93xx_dma: Annotate struct ep93xx_dma_engine with __counted_by Date: Thu, 28 Sep 2023 16:43:42 -0700 Message-Id: <20230928234334.work.391-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1305; i=keescook@chromium.org; h=from:subject:message-id; bh=THP69OmSOtOGZgovd3irCbWFIq76IMb1Eo9RFIZ3FIQ=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlFg+uQsbjWwI6QLDwpDQxEemOjDuINJD24mwrU /jndnL6pPuJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZRYPrgAKCRCJcvTf3G3A JjzbD/9786EPnb+KEovN2A394u+CjRE5feFbV0OH2nJ+hoicNA0BmpvVK6QsaJqscUhY5SzZnIh bJD/VopZIUjwI4FITPqd3Yd03UZG5en7eTcobbpl13XYpOvvHfGmu5sAK7daO4UvRki9YbY/N58 m+5TiNXLb8SwuOLA1TcJ67oPCf1N+kRUMewPGQzE3BrzjsrmC4nzBzItDiBFJaSmSUv/QI5TA5h A+RxcOH11WeE7S4GGhN0EMcTv+w0/K04pncSa6lEdKHKZUL6I94j5oiRsDNdUNih71JGsyM4sp3 Xfg1nHufCoyp/18ig9FZ12Qg4gulxu5dRUqfzDV3HA6QoazyJInWvQizQKTT5hnVX3cTSo2pjN5 aeKyS51Yt2Ie3NIsUgexXgNaU70uD3yqBTWTdK8aPYOBW9/0zJF6Oa3c29hUAB6fqhV6a72H3P+ M8Hm9ZD9HyYzV49KpOi1i8kzL+d/EqbRdTlSnRkyr4rdGzCk16Bvh02vXWZ56G9V09qWS0cJHXn fk74+F+zDDMUPD74z66DuOExRi9n5LzWvhnNfjql7GYDcnKJFwTM9oyTgNnpqvleA22e68tC3eQ oiGIO/BQrniVpKwWJG6melsLUr2tQIeN+Pj4Gh8KP1Myz/9WxSxu7Sqyn502tYFCrQq2lxwXbwm NkdSZdM Y4Zio4YA== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,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 agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Thu, 28 Sep 2023 16:44:05 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778351141663760418 X-GMAIL-MSGID: 1778351141663760418 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 ep93xx_dma_engine. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Vinod Koul Cc: Nathan Chancellor Cc: Nick Desaulniers Cc: Tom Rix Cc: dmaengine@vger.kernel.org Cc: llvm@lists.linux.dev Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva --- drivers/dma/ep93xx_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c index 5c4a448a1254..d6c60635e90d 100644 --- a/drivers/dma/ep93xx_dma.c +++ b/drivers/dma/ep93xx_dma.c @@ -213,7 +213,7 @@ struct ep93xx_dma_engine { #define INTERRUPT_NEXT_BUFFER 2 size_t num_channels; - struct ep93xx_dma_chan channels[]; + struct ep93xx_dma_chan channels[] __counted_by(num_channels); }; static inline struct device *chan2dev(struct ep93xx_dma_chan *edmac)