From patchwork Fri Sep 22 17:50:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 143815 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:910f:0:b0:403:3b70:6f57 with SMTP id r15csp92890vqg; Fri, 22 Sep 2023 22:18:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHRQaXjVR0rp1KTbbbJxVVpQh1hIFghjGPmviWPvj/ZgzOgtJz/DsG8Kcuw0jLoaDCoYpag X-Received: by 2002:a05:6a21:19e:b0:15e:1351:f33a with SMTP id le30-20020a056a21019e00b0015e1351f33amr1566336pzb.47.1695446304800; Fri, 22 Sep 2023 22:18:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695446304; cv=none; d=google.com; s=arc-20160816; b=PIS7dLrjN3sfuaRrTTI2+U0kthlstQChBCW+4LtSTCoQIch4lsmxeWjamO2GBeOnPV R2DchTCUEdJwQet+o8QXwMV8ST5vZeGvcgC0RT/8IiPSSRW0TghEzWCuXlwHVIKG8Fyp Gj+m6g9g7m0SDkAzre/i385VzO1hlQuOUux1BOQ9ghD/WwhcwVXL/BKuIWgnwqinfWdh PODeQxRXyOYG9MDE8hOi+Lb48vCoMUbIbIzM3UMZ4jV4bWK6qiAaueYRZWPuolWU0Df6 lTrScWmO+SGqDgGhY8c0SCkjBEnIS/KXwrBVXMaWQWq6mGtxKSY1cqWCh2TTZP48CoZC LooA== 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=fnSUWF58ojeWw3KcW4a/aInndGgQ4B+bmfIwHKF+S5o=; fh=1B3W5TscAbkA9OaZROYZYvahFVOiHm9IdOg3mm0xnME=; b=Spsof1UVEsr8U08XF6rnf4Fm2QD8Ue6PgmTz/DBA5Qhy4x4O9KYOmMamKKEpuEhSLr VEZTHLnH3m84Tn06AruCU4CVUmpvyf6sXM1i2RUmFRmLL+Uc1xbqhmmjbnp2nfCk+LdH lkY3A7NzwxVVgF5MbFB3321cRRqhJXWhSKlHrSFm/ssOLwdAiPn9Tuq0vLzx1dc1NhHw dLyPeb7Qw7l6TqQCBsMcE9C9Ibyq7po8tDbJLwvvK2HTw/DAZxLWocq6vZtVRHQGj+Dp bKwNq/ot+dGSMc0m88gYwAffGZiY3ywIxnmDNZX4lf1nv7BaNwv+1yKdkyxVhgU12K5n VJVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=gfpr3HVE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id h14-20020a170902680e00b001bc671d6d15si4991954plk.614.2023.09.22.22.18.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 22:18:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=gfpr3HVE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 37880853F28B; Fri, 22 Sep 2023 10:51:08 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233469AbjIVRuq (ORCPT + 28 others); Fri, 22 Sep 2023 13:50:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233050AbjIVRuc (ORCPT ); Fri, 22 Sep 2023 13:50:32 -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 F1B69CCF for ; Fri, 22 Sep 2023 10:50:21 -0700 (PDT) Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1c43b4b02c1so20321915ad.3 for ; Fri, 22 Sep 2023 10:50:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405021; x=1696009821; 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=fnSUWF58ojeWw3KcW4a/aInndGgQ4B+bmfIwHKF+S5o=; b=gfpr3HVETdCpSPj68Jn7btta2NHRIIz1qe/Tb8lWORX+eUdi38/gWBqpO7/kIFfRS3 Xeu3s7t+KKL3kCUFOmGwr0EWHtRZ75iG61zxX791oo1Smyd5EcHLPl6NA/6Byg+gADRT 8ekqVfqxgNdsExdR7lifPZ8H7iQ+6teSgDV84= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405021; x=1696009821; 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=fnSUWF58ojeWw3KcW4a/aInndGgQ4B+bmfIwHKF+S5o=; b=NswsMh6j+hc2+d0WoPZN9OLEF1tqKl4YcrqXunTuwPlKFs0A9NxT8cHI8rdSQK6MlK 6XzhdAQLBNSXP+cK0yuy6vn3rALCcJTLTguZf5Rkjj7//1MegozwzpMZnVd6xoQNcVM+ kTRSTtTRSSSQXP8x0e2RLxDmZKhVxFXucZ5HWC32JMTs5xfKlOCZsmYfnaGmF1g7q41p 6gXTe3qIJKtGmzeh185cdFExuhxGDjfJjgcT39knkTGnXChv17ikg24oRYSXCgiEtrAy uvkyh1YmxDG5I3I/iJeS8O5wk4tSEc/AlXGkStnBOfK26EZAPakZBNpI9dTBz+HSYo9n LFnQ== X-Gm-Message-State: AOJu0YymdTHqGF0dOYECIckE108PtAoQYvLVpYHkxCGDI+21ZJei+D4e /ehff4taJoueYVTdy/M1vaymsw== X-Received: by 2002:a17:903:2348:b0:1c4:13cd:b85f with SMTP id c8-20020a170903234800b001c413cdb85fmr154761plh.5.1695405021369; Fri, 22 Sep 2023 10:50:21 -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 j7-20020a17090276c700b001c0bf60ba5csm3750500plt.272.2023.09.22.10.50.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:50:20 -0700 (PDT) From: Kees Cook To: Alexandre Belloni Cc: Kees Cook , Nicolas Pitre , Len Baker , Boris Brezillon , linux-i3c@lists.infradead.org, Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org Subject: [PATCH] i3c/master/mipi-i3c-hci: Annotate struct hci_rings_data with __counted_by Date: Fri, 22 Sep 2023 10:50:19 -0700 Message-Id: <20230922175019.work.129-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1308; i=keescook@chromium.org; h=from:subject:message-id; bh=VnYZTZQDzvs6FPCd796RbHEvmVY4nxS6fY7pQ/TUq58=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdPb7evFPyNbPT0FdckJpxJpxqM4N1hl+rZT8 PBWQWPuA6SJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3T2wAKCRCJcvTf3G3A JknqD/4/xs4n4EK36LHG01DepzXWVJmm7fPp0/czFh0mjmYFE+bK4F26rpn6lgsBQhf7ZjQ0Oj9 nKVj0QLvgCFAtpBT32huepq+fL5RwuTNOtJ2/XlgSeNhVNO5huuxSsL7qveP4T2OJRJUWgxsG5S QKEU1ED/1P4CSCOEVITabzeBZjqANlqDE8aZVqz48j+C7Su+O2MeQZ8+tgA7ApE0UIynp599kxT hirXsgBk1UnxTKiCT/8YogzSWpIJP/kCfQBluYyuNgjXU6ByV771+6OFIHXuW1E5us27fhmapqS AgHC5MfhZAvS50WOCpsVNDXSCe0dM9hnEPgA6yscEl3Y5z6OE6D7GZBsj0C8T5ksP4j/kIZHQ3S eTPF69qS8MYYgPaCYKJi727lFoCd8EVEZhT5njFT2SWBdE83dALCTI5SisWRPjcAHSTJk/5TSpf wsaA+sMNRgxMRlF10ZSBfoDRlDd6HDPFL/leLCXvJMyCXNuNgs+EBtVHvlrte+K44NEq3qlVb5F ZXGWXTLNs6/9I4s5DWl3JrRbuvoTOUGWi9Pdc+RmUPx0sU3LAJgltK/3gAwmfpJEZHJVRuDmxuX Nu+VZAWXphQB9Gs3lc6M9eEGG+ijJjygN/yin4pvq+fQY13ztOFq8RKo7MKTBrH8D/1AfABwnBH 0WbbyJb xBwZlDsA== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 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,URIBL_BLOCKED autolearn=ham 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: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Fri, 22 Sep 2023 10:51:08 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777804304644596012 X-GMAIL-MSGID: 1777804304644596012 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 hci_rings_data. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Alexandre Belloni Cc: Nicolas Pitre Cc: Len Baker Cc: Boris Brezillon Cc: linux-i3c@lists.infradead.org Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva --- drivers/i3c/master/mipi-i3c-hci/dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i3c/master/mipi-i3c-hci/dma.c b/drivers/i3c/master/mipi-i3c-hci/dma.c index 2990ac9eaade..a1ecdfc35641 100644 --- a/drivers/i3c/master/mipi-i3c-hci/dma.c +++ b/drivers/i3c/master/mipi-i3c-hci/dma.c @@ -139,7 +139,7 @@ struct hci_rh_data { struct hci_rings_data { unsigned int total; - struct hci_rh_data headers[]; + struct hci_rh_data headers[] __counted_by(total); }; struct hci_dma_dev_ibi_data {