From patchwork Fri Sep 22 17:51:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 13396247 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C62443AB8 for ; Fri, 22 Sep 2023 17:51:54 +0000 (UTC) Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC03D1BD2 for ; Fri, 22 Sep 2023 10:51:34 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-690fa0eea3cso2265586b3a.0 for ; Fri, 22 Sep 2023 10:51:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405094; x=1696009894; 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=zImIKIqhOC0JjIYPrD3YIO1bPD4ZjWOlSN8lcYpsf6s=; b=nWW16v5k1LbEMTgaTiQp3gfTSU/lEQTL5de4k8P+2xveqaPy6R0Cll85Vkmdjs7m0j 28x5zAUjeDNwEVpSgy4gh7l+Asv9qPEUHN517bvXyf2ZU7IDXJp0BVo5LxHarB2b8LO2 tsON67yjDAnd9dzYksuEDqwQaIXBZi2bvPmIU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405094; x=1696009894; 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=zImIKIqhOC0JjIYPrD3YIO1bPD4ZjWOlSN8lcYpsf6s=; b=GTIcBNBCRgHG15N4YjtgDnCjHoa76+d6jhL4tLjH4Bm/HgTBxSQBRGWaQnr5qTnrXB 7+gQmETz1BTfWCmHPAZHYOrCQyvBzByRXbqGsXAvgch3lyt7pQLUb2bGPRQz8rbayrRv IoLHjqNVb2hxngiIcEBSaP93K4s8T8B1GICuO10ytyC1qE1kki1BnKM+aUip9FX+tPgD PE47YDB+mlHAZeYPrKYqRcA9DGuFx3zzZKfpXUOMln1whDj1MhINm2wh9DxRFzqB0X0+ pPWRLkFfuVGrCiTqFcxHI4MPvm9Qrpf4uP8mt0qk+W/ASWIiMQyVGhUn+jBPK9R7XEYa hnxQ== X-Gm-Message-State: AOJu0Yy8JNmh3Ua53c4sUmF6WWs7/LIavVWQ07qpq7qere0y21VzExry 3Z84aYEkFA+MfQJsjL93+BgJ8g== X-Google-Smtp-Source: AGHT+IEYYptw0+9UxsBkFMm+xCNLTAlvlc4VwNyOSgculGB2Hj2uBhFKvrLo2zEAv9fjQs4NAvIGMQ== X-Received: by 2002:a05:6a00:14c2:b0:690:28d0:b7b3 with SMTP id w2-20020a056a0014c200b0069028d0b7b3mr153527pfu.13.1695405093734; Fri, 22 Sep 2023 10:51:33 -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 n7-20020aa78a47000000b00690dcba0e17sm3585690pfa.19.2023.09.22.10.51.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:51:33 -0700 (PDT) From: Kees Cook To: Thomas Gleixner Cc: Kees Cook , Marc Zyngier , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , 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] irqchip/imx-intmux: Annotate struct intmux_data with __counted_by Date: Fri, 22 Sep 2023 10:51:32 -0700 Message-Id: <20230922175131.work.718-kees@kernel.org> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1459; i=keescook@chromium.org; h=from:subject:message-id; bh=mvFgO9v5w2MsRDjwkJuQ6DC2ihWdFPibyg0TMHS5b5Y=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdQj18/exFGglEhzz/3o7XP1T9eIIjqKTUULZ ltYTkOtcfmJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3UIwAKCRCJcvTf3G3A Jlj6D/9BqGkE2W574Xw05XGeAb3CJxzSEdnLhcmqWJNeogYU+KV88H3NybOUiCfp9zf+KC1yjg8 OarGW7ESXkT0amr5GFqz6fzX3V1SXLO/V51G6kJDDj5BbJLWNJK8IJZPQ1nMnyb+wIvjCmCsnzq w62V7vklfDGTF92LSXY5cwv5m2x2pObAZUng1ykQLgilxTo15p2ZXgLjk7QpIAt6ghoKcNZ/iqZ xt+XzolLJnXDkrl9g1uwT2WKJIBe863fabXwcpvxtcW63AP/Waut3igfrvAxc7ECcFEImfIGK0b 71Kj/aEfV6BIQazzTszq/xAcbsITzg2MQUGtrLMdynneIk7l11BifL/CelQNZ7H4Qeh6l+kPVId u8AoVMPYH8YR/QXiaOnaHdho2a2l+XT1oLJeFfstRokrOwbLx90eDHpnbIzPeEqWPDmFpQ1NaxY CE0iop56AlfvXQwTVQMMLTBn7g6DvEi1+ZbV4qE/Bjyl/NEMpH7pAaw+lrqcGVCcMGXbeq/sh6Z qY6i3svt2Red91t7+Is8XG01LbBqfqVzDbx2m9DZg6xxqHTCM/Z0w0UFqXo7B8l/QNCM950hpoZ jyyr/mgHUXhjPOFxM4zZfKxP0KqE7PAwo6lN9rYqPM43vpXiBhML88yfSw9Ffe0DMO+aV5qxFFe AqWpvZf SE+5Plyw== 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=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 intmux_data. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Thomas Gleixner Cc: Marc Zyngier Cc: Shawn Guo Cc: Sascha Hauer Cc: Pengutronix Kernel Team Cc: Fabio Estevam Cc: NXP Linux Team Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva --- drivers/irqchip/irq-imx-intmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-imx-intmux.c b/drivers/irqchip/irq-imx-intmux.c index 6d9a08238c9d..aa041e4dfee0 100644 --- a/drivers/irqchip/irq-imx-intmux.c +++ b/drivers/irqchip/irq-imx-intmux.c @@ -73,7 +73,7 @@ struct intmux_data { void __iomem *regs; struct clk *ipg_clk; int channum; - struct intmux_irqchip_data irqchip_data[]; + struct intmux_irqchip_data irqchip_data[] __counted_by(channum); }; static void imx_intmux_irq_mask(struct irq_data *d)