From patchwork Wed Oct 11 21:35:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gustavo A. R. Silva" X-Patchwork-Id: 151562 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp828582vqb; Wed, 11 Oct 2023 14:35:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE2ldk89N7nO10+HIWoXBoDfmsAxWqV/o4tv4qhF5KAJCf53Oigesr4gMhV98MXebmuoVab X-Received: by 2002:a17:90b:3c0f:b0:27b:2464:82e9 with SMTP id pb15-20020a17090b3c0f00b0027b246482e9mr15862389pjb.4.1697060138079; Wed, 11 Oct 2023 14:35:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697060138; cv=none; d=google.com; s=arc-20160816; b=ZwU5UPRG9Z+7vxGkzwCO4POD5870ZazcPqL8meghBmHdYjtRX15A6YhL5MT/pMkDGx trUjq8wTLzIlv2+tBe8YT18Ft0v8YnnLjSM7syV3FYCnzyvs3UEyt7lTRD9zEYZEAtdO lMxo8W+wYBFEGcmLVhNGLq62cCE+jgXvTr2jYzRmOcg18AotLBBWnd8AI39xdBrj5lmA txCw1/dd8NyTUaMz3WQPx7atLw9C59YLNCcfAx3nFy6qGIa9IR/QkaC3SmoQHuVYHrql 1+rAniwka+vWt9k/4MGdQlDjsgS6o2PGGAaOLZbWChmtIgfk1To3oeGNqwsGTJQcE+VW w6hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=zsRJ/LY2rVKHlHEjmXKJx50sPHq9SbH7cXVQUf2/3X4=; fh=uBtqv/kPFyoqWehSaASRS515pQ2wFqsb3kRG8pu85CU=; b=NpCoP2Sl5tcM3Ju0z/jDPMBjqqbgulN9zeWQke5r+Oc3/gw/vaUz8XoxbyNoW0Ns6X 1FJuOojQv+X0VPbXAzNxzphoE2bythva2vGu4ctytNV6gHxEDhBiBtrByz46DQzURElZ IodoJZPPMszt16P5G2QliE7npklQ0jnQRqjYvf5C9Z8BHR7NWvazIhB6jJL1Tqxfn6fd uAjqhEosZgwBDzKYoBWMfKkYZLh/jyoPKyEQkmKesYgOQr2fGQZAqlLZtzwsHSXH0uev yAc5lTVllSVEfmVpYSJFyGp18xJ1AQyIEWItPhtEhBubglYQuBqFNS1W9YuBSJ1NBSpj UpuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="kNYW/FwY"; 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=kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id cv14-20020a17090afd0e00b0026f9b5fe711si690924pjb.108.2023.10.11.14.35.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 14:35:38 -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=@kernel.org header.s=k20201202 header.b="kNYW/FwY"; 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=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 3465B81E5938; Wed, 11 Oct 2023 14:35:37 -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 S233552AbjJKVfd (ORCPT + 18 others); Wed, 11 Oct 2023 17:35:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233390AbjJKVfb (ORCPT ); Wed, 11 Oct 2023 17:35:31 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30165B6 for ; Wed, 11 Oct 2023 14:35:30 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E9B73C433C7; Wed, 11 Oct 2023 21:35:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697060129; bh=PM4wVgjnlrfHwdA7S+PhJzx/9issRPMRVudoJHFwByE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=kNYW/FwY2ePqF8PLH8UQE8uhrOQqbFCoDa05SD0YRoVusD2J2Z/Qq3kkZ+4yosoMB bnu+iXP+fodYNCV1+6oSPrtZvsrYE+T8n70Xf0i6m4LTzElORplqAHze6TJq3LCyRK gqQ2/fzVAaNogW6G15n408Yq/oT7OMnAPoWz15dxLOXXiEDDzNKY3BNo0i0yIsoDUv I75HYfGZ9cUFzAsqDratSM0GlKtgnBJOJ/cEc3Ntxd77LvSZW4tNJXesEbcRKITWY3 GYmtYMmPQT7TVLoFwBq+krc8zUJoydyeYVleC9WXNhco4txcYgffQMY85jLAYjLCWZ Q7/YOsvfGquWA== Date: Wed, 11 Oct 2023 15:35:26 -0600 From: "Gustavo A. R. Silva" To: Dinh Nguyen , Michael Turquette , Stephen Boyd Cc: Kees Cook , linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org Subject: [PATCH 2/2][next] clk: socfpga: agilex: Add bounds-checking coverage for struct stratix10_clock_data Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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 (snail.vger.email [0.0.0.0]); Wed, 11 Oct 2023 14:35:37 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779496531265706486 X-GMAIL-MSGID: 1779496531265706486 In order to gain the bounds-checking coverage that __counted_by provides to flexible-array members at run-time via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions), we must make sure that the counter member, in this case `num`, is updated before the first access to the flex-array member, in this case array `hws`. commit f316cdff8d67 ("clk: Annotate struct clk_hw_onecell_data with __counted_by") introduced `__counted_by` for `struct clk_hw_onecell_data` together with changes to relocate some of assignments of counter `num` before `hws` is accessed: include/linux/clk-provider.h: 1380 struct clk_hw_onecell_data { 1381 unsigned int num; 1382 struct clk_hw *hws[] __counted_by(num); 1383 }; However, this structure is used as a member in other structs, in this case in `struct sstratix10_clock_data`: drivers/clk/socfpga/stratix10-clk.h: 9 struct stratix10_clock_data { 10 void __iomem *base; 11 12 /* Must be last */ 13 struct clk_hw_onecell_data clk_data; 14 }; Hence, we need to move the assignments to `clk_data->clk_data.num` after allocations for `struct stratix10_clock_data` and before accessing the flexible array `clk_data->clk_data.hws`. And, as assignments for both `clk_data->clk_data.num` and `clk_data->base` are originally adjacent to each other, relocate both assignments together. Signed-off-by: Gustavo A. R. Silva Reviewed-by: Kees Cook --- drivers/clk/socfpga/clk-agilex.c | 12 ++++++------ drivers/clk/socfpga/clk-s10.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/clk/socfpga/clk-agilex.c b/drivers/clk/socfpga/clk-agilex.c index 6b65a74aefa6..8dd94f64756b 100644 --- a/drivers/clk/socfpga/clk-agilex.c +++ b/drivers/clk/socfpga/clk-agilex.c @@ -471,12 +471,12 @@ static int agilex_clkmgr_init(struct platform_device *pdev) if (!clk_data) return -ENOMEM; + clk_data->clk_data.num = num_clks; + clk_data->base = base; + for (i = 0; i < num_clks; i++) clk_data->clk_data.hws[i] = ERR_PTR(-ENOENT); - clk_data->base = base; - clk_data->clk_data.num = num_clks; - agilex_clk_register_pll(agilex_pll_clks, ARRAY_SIZE(agilex_pll_clks), clk_data); agilex_clk_register_c_perip(agilex_main_perip_c_clks, @@ -511,12 +511,12 @@ static int n5x_clkmgr_init(struct platform_device *pdev) if (!clk_data) return -ENOMEM; - for (i = 0; i < num_clks; i++) - clk_data->clk_data.hws[i] = ERR_PTR(-ENOENT); - clk_data->base = base; clk_data->clk_data.num = num_clks; + for (i = 0; i < num_clks; i++) + clk_data->clk_data.hws[i] = ERR_PTR(-ENOENT); + n5x_clk_register_pll(agilex_pll_clks, ARRAY_SIZE(agilex_pll_clks), clk_data); n5x_clk_register_c_perip(n5x_main_perip_c_clks, diff --git a/drivers/clk/socfpga/clk-s10.c b/drivers/clk/socfpga/clk-s10.c index 3752bd9c103c..b4bf4e2d38e1 100644 --- a/drivers/clk/socfpga/clk-s10.c +++ b/drivers/clk/socfpga/clk-s10.c @@ -402,12 +402,12 @@ static int s10_clkmgr_init(struct platform_device *pdev) if (!clk_data) return -ENOMEM; - for (i = 0; i < num_clks; i++) - clk_data->clk_data.hws[i] = ERR_PTR(-ENOENT); - clk_data->base = base; clk_data->clk_data.num = num_clks; + for (i = 0; i < num_clks; i++) + clk_data->clk_data.hws[i] = ERR_PTR(-ENOENT); + s10_clk_register_pll(s10_pll_clks, ARRAY_SIZE(s10_pll_clks), clk_data); s10_clk_register_c_perip(s10_main_perip_c_clks,