From patchwork Fri Sep 22 17:53:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 143821 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3676vqu; Fri, 22 Sep 2023 23:00:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFu/lb5p0IisPEi37HIJeWc9CgQBIaLHviPQeBcovgZg5s92RwbMdsL26m48RmFXteV41af X-Received: by 2002:a05:6871:4912:b0:1dc:f4de:46b8 with SMTP id tw18-20020a056871491200b001dcf4de46b8mr27146oab.59.1695448828093; Fri, 22 Sep 2023 23:00:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695448828; cv=none; d=google.com; s=arc-20160816; b=w11Qmz22Q1fPQ2g4IzFgwB6VRQpB9NcIrAT6KVeDnqUp5it4rS3hTl7YGjRQ8wRG2p pAno06VjaFrG44wNp46zU7ZIdjipisteCChYc31tKQg1oM8q+y2V5vUG5spurVsZFyXR Pk1uPXVw9bEDi8ax2c1hBg2ipD2I5ZYamYvk/t2XV0Wk1MKzg4ciSUSQSjexfcdq4LFM 77xVQa2AgYVchB1iizmM7iGZ4m/60CaWvL5HJH+H26DhUfnuRPAXSb9F+U3crEu+SNd9 ZDE6q3BAiWXZ+H/Cu53y+cjgToiWfGuRjTvlVdZdm2TkLgGh61T8ocDtttJcYNG8w/Ur HxbA== 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=C/sXEbgxXtNKYo/L4/vhLbpgVFK4H06rEANzOjtTwNM=; fh=69XCsJ/jdzxTlLdoITIzKf+JRfCKrTZonaGIHbSGgKw=; b=SjCqoSoxsTY4405D3pZJChib9OORmjiZMWdgqqWt72aAyxCdSxAz7YkUyeg94becYK ZD8GD4SsoPP5l9IqBo6JJCm2walMgvFwPRBxGbbYGTPLuv+qD57q9bQ0WAELnZKnPGY7 3PUX3cqfCAMhwki8ym5PrS2DesJLQTBfb8ixAjMmt7C635KjzXn60JPeCQBc+Sfn067d 89loqxx699XYLbxrsBd+xUdlW0npjkiett+fAu6DHM1mTgNbtKdpMdcu76CJ/R5aHjKX 2JyzJ4FLsaX7xwqqfIncLbAxdvcgmjycMgaH88aoLrlrznd3yX6PCY5Ykipdc7Qc+PAN SI+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="Opo/Lw9X"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id u23-20020a656717000000b00578fc9e1ba9si5256231pgf.177.2023.09.22.23.00.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 23:00:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="Opo/Lw9X"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 8D3A782D1A3A; Fri, 22 Sep 2023 11:05:28 -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 S233550AbjIVSFU (ORCPT + 28 others); Fri, 22 Sep 2023 14:05:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233650AbjIVSFM (ORCPT ); Fri, 22 Sep 2023 14:05:12 -0400 Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36A5530D8 for ; Fri, 22 Sep 2023 10:53:54 -0700 (PDT) Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-578b4981526so1818902a12.0 for ; Fri, 22 Sep 2023 10:53:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405233; x=1696010033; 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=C/sXEbgxXtNKYo/L4/vhLbpgVFK4H06rEANzOjtTwNM=; b=Opo/Lw9Xcz3gvImn+NciJDMentXtHzLqobpFUi/U1ddOICmS1ET8QtHIHvhavSxCM8 Cj80HQX0Xr95NCUCmAGPLecK3RX4jzO+3pi+/BVILBDWiG0hZ8DEy9W0doYaQJXDNlsf i9Qiko+CcLGUzdUtspAxxTii54hJ07oiVC0HA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405233; x=1696010033; 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=C/sXEbgxXtNKYo/L4/vhLbpgVFK4H06rEANzOjtTwNM=; b=PQck8d4I0vsyeHmA2mCN8PFZFQoZBCAdK+6VvH8fsy+K36OQ1B2Fe9JDTwtquEFxwt kcg8qRziGX8dY3p3/4rqJ8k4Eh6ez8sr21utqE5rJDJVI30d1HA+cMG4VbOZ8hbKhPor qGH5wW+I4FEcyuj9wQorCe+T/bU7TzIEswCu1OcSqxVEGGUB4gPf/nFRT9YfI9GjX+JZ HyCuSPfsj+ksa/VScvtn1Hdi2ya9Ko8TQtDAXp6qM5IhPSwg9CrCLtYYhcamxzt6NBgO 5Lz3Kt3uexYrB1VfHwyX0sOly44qRBEtovHJdTish07piGQWVE648hKWFfsKloFK4Tjv bovQ== X-Gm-Message-State: AOJu0YxOvHhNfYo7IlaVWPdXaOYh5cdVdXoyh1dMJ2thLS/Ni2IEoPAS 80SN7Eqr3e46Kq9YgMxJUvZuSg== X-Received: by 2002:a17:90b:1e4a:b0:274:5e18:851c with SMTP id pi10-20020a17090b1e4a00b002745e18851cmr438131pjb.4.1695405233436; Fri, 22 Sep 2023 10:53:53 -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 15-20020a17090a1a0f00b00263dfe9b972sm5559788pjk.0.2023.09.22.10.53.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:53:53 -0700 (PDT) From: Kees Cook To: Jassi Brar Cc: Kees Cook , Michal Simek , linux-arm-kernel@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] mailbox: zynqmp: Annotate struct zynqmp_ipi_pdata with __counted_by Date: Fri, 22 Sep 2023 10:53:51 -0700 Message-Id: <20230922175351.work.018-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1269; i=keescook@chromium.org; h=from:subject:message-id; bh=1poq85ba9j+7J1PLFH3/OUdUEKILRF+ZhAzDjq4Mb1A=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdSv0B0ZAwn8thcnEoGKGRm6tzJNHNC4p1SKM twNnK6o/LyJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3UrwAKCRCJcvTf3G3A JpICD/4s9t+i2GRgZhTVaFg+1WEWAK9XubwciA/mVOtx0WxFwtlB9FKhov7qaG3t9gZ4lzoMrMK 4xct4DPrkm3EJX4D71EADhTvPbCzsPcJVxqrxLdUptg/nCgNrvKVRvigyvw8dJN7CEMKtohXO3p 7+nD+RxwWorUc5zOaJhIUX+OtZN1MgqqXNHH3XlSPRglnMIiCg9uL12FUXGQ9huF9W2+CBdC5/G 2hjhh2JfjT+ZkxCYjfsgakw3gz/B6lNH9B4ESOTQ+JDFCovfy8npuG/lnEPWVl1t3aQDTw+Ggvg Bm2VYWACynNShZlEisvshdeozocThIzZnp5388I/hjsfO3dGJ9NkEg3pYxIvaj3ZXmZZHb5n03c BKxHbmk84rHGRDfnv1JshClFI4fUy+QU4s7tTsjmYwvwvuPat04djCAB27Rmu7eKPVknR5U7Ygm F7Xk8GmbeNyOB8r3/b0z47UjjXri8DcBUSRJ7T5I0bci5BacG0974PRqG302aV0mNoOhysxe2rA vZWNpKUYK81yZ9Tsp6Jo+6YD9HH0bNEwmG81K2w6zbCDokfK2+Bz4UZ0OKcF2YRdqOtvdCWi9gy hbceAJvcoBvTaOPPT8bPQO7sA6TSJxF1xrFLNO+WzUCykLJ1nPq8GXQUBWK44XyhikDJI4Qe+hK FTeA9y1 2E9MSx2A== 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_NONE, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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: 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]); Fri, 22 Sep 2023 11:05:28 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777806950173846762 X-GMAIL-MSGID: 1777806950173846762 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 zynqmp_ipi_pdata. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Jassi Brar Cc: Michal Simek Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Acked-by: Michal Simek Reviewed-by: Justin Stitt --- drivers/mailbox/zynqmp-ipi-mailbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mailbox/zynqmp-ipi-mailbox.c b/drivers/mailbox/zynqmp-ipi-mailbox.c index e4fcac97dbfa..7fa533e80dd9 100644 --- a/drivers/mailbox/zynqmp-ipi-mailbox.c +++ b/drivers/mailbox/zynqmp-ipi-mailbox.c @@ -108,7 +108,7 @@ struct zynqmp_ipi_pdata { unsigned int method; u32 local_id; int num_mboxes; - struct zynqmp_ipi_mbox ipi_mboxes[]; + struct zynqmp_ipi_mbox ipi_mboxes[] __counted_by(num_mboxes); }; static struct device_driver zynqmp_ipi_mbox_driver = {