From patchwork Mon Oct 16 22:06:16 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: 153775 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3749942vqb; Mon, 16 Oct 2023 15:06:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFMfQUJ9kqZhGRtt2e8G7xoemsBWQUoArDbSN1VVcRUx2afrLOMYU3TmTcEnnLtnqxiO6Ww X-Received: by 2002:a05:6358:9f9e:b0:166:d9b7:ed8d with SMTP id fy30-20020a0563589f9e00b00166d9b7ed8dmr459246rwb.2.1697493997666; Mon, 16 Oct 2023 15:06:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697493997; cv=none; d=google.com; s=arc-20160816; b=j8+uG5YhHvOvwuoxZNrY868MSI1OV9gMbkNLTfnHGTFooVV/a5RE8r2AtwDYVWva8k xnSKEREpjh5CWsHEWfXnAwxcvCkyT+zb15gnzoSH4u9aldlprLHuYigzgRaqf5aebX+0 l1eKS4f7LCqViJiKABuotfEUO2Mhl13FNfYm1i7EMQIXV/T0nY0llKU6GZLyxU4IVJO3 I1K+Cs16lMn3+aZax3waeBJ4/yJsb/1Q4g5dfS9tP5+1OQb7kllR5SPYzjGofnzOAWn8 gFCGQwl0rBjYO08hF836czsmTrxEv75iaby8qadQH4gQQNCSlHS/gror1k/TVBmU9lyC BdLw== 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=aOAZ1onBA7ZlTxoGtt1RavgJaARLlVJUbq1IBtvtoJw=; fh=gk24IOEycqD+6u11idkE8VXvRMctSQA5r+DBdFry3D0=; b=XGZ5UxRIHoh+o/oZvEDTVlJJETeXLo0GPOdknwVeXRdxSz7oDwMkqMVsUfi6Sj0YFz 6tWAt2bloMUGMGQpR7Nt/N8+RzlpbMtDaAg/2/Hz3aesln7z3NyDe5qvu30pcOBh9n5c mVzESZh3I6WYfqeYnjTL7eeh3NSIgam7Ohot2YWQQLcN0167fxuFp0Uj59JC368ITlDA Ak6aCgGKE0kpqU1tHyqaiMatHsooKRMpvaYozgk9sfh3bnQmt2AOsTJwzuY2PzS6KA6x mt9NIbuUWNdxxNWoLQR1W7AWA2+m/AW6v3zrWSKgsflV2BJ14jas7+GLjI+ECBSR7QE/ PSTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ub0BOQHx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id fb10-20020a056a002d8a00b006bd8c5a3b49si154482pfb.90.2023.10.16.15.06.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 15:06:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ub0BOQHx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (Postfix) with ESMTP id CCF9D802076F; Mon, 16 Oct 2023 15:06:34 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233384AbjJPWGW (ORCPT + 18 others); Mon, 16 Oct 2023 18:06:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231955AbjJPWGV (ORCPT ); Mon, 16 Oct 2023 18:06:21 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82A20A1; Mon, 16 Oct 2023 15:06:20 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B94CDC433C7; Mon, 16 Oct 2023 22:06:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697493980; bh=D7fdEpe0zShD1pFuLK68iJJXBS2qGwVgntab6FWqrjo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Ub0BOQHxbWbUL85k9CgeLDCVNKg+n4jXSewv2gYqW1hfR3aBKTBygdAWyh75PAjOW jxg8DoU0PVbfCtkElQZVFZhb+qZ0dHh/NM3NNWXtsgMFMEDTQvpiiaSWoqczCfTNNv KWG92ncXKedXiJKitRh4LxKowpJicMN50Gik79sg4/ZLAnuVbCymw+Npe8nTmRE4rF QQ68eBToPSHUGgVEMlMFAimZYnXuF9hQ+U2O5FMrPuoVmUK5IV4MqHayLzhJF6L4qf tXNXSQJriezup5YH64Mfc7OMl+GsOyUjow+VZIAUKCoVJ6PRPrqb8IjJKPcZ2Khqde GtamlmfPp70ug== Date: Mon, 16 Oct 2023 16:06:16 -0600 From: "Gustavo A. R. Silva" To: Michael Turquette , Stephen Boyd , Nobuhiro Iwamatsu Cc: Kees Cook , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org Subject: [PATCH v2 2/2][next] clk: visconti: Add bounds-checking coverage for struct visconti_pll_provider Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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 morse.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 (morse.vger.email [0.0.0.0]); Mon, 16 Oct 2023 15:06:34 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779951466501707129 X-GMAIL-MSGID: 1779951466501707129 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 particular case `num`, is updated before the first access to the flex-array member, in this particular case array `hws`. See below: 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 visconti_pll_provider`: drivers/clk/visconti/pll.h: 16 struct visconti_pll_provider { 17 void __iomem *reg_base; 18 struct device_node *node; 19 20 /* Must be last */ 21 struct clk_hw_onecell_data clk_data; 22 }; Hence, we need to move the assignments to `ctx->clk_data.num` after allocation for `struct visconti_pll_provider` and before accessing the flexible array `ctx->clk_data.hws`. And, as assignments for all members in `struct visconti_pll_provider` are originally adjacent to each other, relocate all assignments together, so we don't split up `ctx->clk_data.hws = nr_plls` from the rest. :) Reviewed-by: Kees Cook Acked-by: Nobuhiro Iwamatsu Signed-off-by: Gustavo A. R. Silva --- Changes in v2: - None. v1: - Link: https://lore.kernel.org/linux-hardening/675633f7ae9893371d35b238f06fd02a3acffebb.1697076650.git.gustavoars@kernel.org/ drivers/clk/visconti/pll.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/clk/visconti/pll.c b/drivers/clk/visconti/pll.c index 1f3234f22667..e9cd80e085dc 100644 --- a/drivers/clk/visconti/pll.c +++ b/drivers/clk/visconti/pll.c @@ -329,12 +329,12 @@ struct visconti_pll_provider * __init visconti_init_pll(struct device_node *np, if (!ctx) return ERR_PTR(-ENOMEM); - for (i = 0; i < nr_plls; ++i) - ctx->clk_data.hws[i] = ERR_PTR(-ENOENT); - ctx->node = np; ctx->reg_base = base; ctx->clk_data.num = nr_plls; + for (i = 0; i < nr_plls; ++i) + ctx->clk_data.hws[i] = ERR_PTR(-ENOENT); + return ctx; }