From patchwork Mon Jul 31 20:53:44 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: 128872 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2271676vqg; Mon, 31 Jul 2023 14:19:31 -0700 (PDT) X-Google-Smtp-Source: APBJJlHSfM62WqEulCaLR9/drN8H9LFxp6Jl7AHGKZYeNiv2J+S+znatnQIHLxGRX/xYHii2R68s X-Received: by 2002:a2e:2c0e:0:b0:2b9:bc5c:1b28 with SMTP id s14-20020a2e2c0e000000b002b9bc5c1b28mr759415ljs.49.1690838371370; Mon, 31 Jul 2023 14:19:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690838371; cv=none; d=google.com; s=arc-20160816; b=hgXLg7ewnDgN6Ry4Fe5UOlMnC/LoK+zVi+uv2kaejHxaRxaBeBzxYnJz9fJKQcDbaH dgB0HEZyEsrN9hhsd3PkNWSHetCGFVrZiDkKg6Y22H5aCOOEICHTjGng9By4yfuP5R+A 8WaVraK3I/GCBuY+SMyYX7r4uUGxVEIYNIztFYXHyjxRSldgF2N3t3WAux7DXqaJ6uDL GFKCR+HqKfLKKUe0vGIQ/o4qBWmrpl3i8M99Q2+1ecDp9TIpF63IsAGFyxib5UAjGnfR O2u3TvsyKL8EENST+nGW2YrKYRq02/ILVYBwIziep+TdEfkEfVS50QwNw0TiovzGJW73 XuhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=ex+vESuw4PILCu7Ppt/4eZ9XkDl7462CIfpa1S9hg2M=; fh=HkdaBjX0iZS7RwtLCzLEGE6+Tl1BtmIGSHaAETqBdDw=; b=Z+M85e5DMpaacUzvB5Xc2jLm4t7UZQcE+cBxYsgMtl7o1ss+EZMXgtbKtWuIHh66PA CC3B+knvvkwlMa2/COjqKplH+z4W1YAYhy9dY38eJDHfOZ0btgmwtaq3ClBosw/IIgHu WUmpmaCQEqXdbr2vhmf0cKvmiO5pG6XLfqFbF0lC3eZDuXkGs2FZPk22DOi/X5V3EONr jTqTCDdZmtUJeJxO2VQm1z73+CINlgKVl6Em5vKj9LyYXoe7q1yIPiRGFVzJ9Br3vdHZ 2DW8tsJPOxV8R5+UbpQnIu5icrYHRos8OQjx6n1YxndqHtSA4KrUy5DTpqPKg3MJhrRk 8NAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=eY+wxcw6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z17-20020a170906815100b0098d9dfee9c7si7724982ejw.493.2023.07.31.14.19.07; Mon, 31 Jul 2023 14:19:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=eY+wxcw6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230423AbjGaUxA (ORCPT + 99 others); Mon, 31 Jul 2023 16:53:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230441AbjGaUwu (ORCPT ); Mon, 31 Jul 2023 16:52:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D23D198B; Mon, 31 Jul 2023 13:52:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9521C612CC; Mon, 31 Jul 2023 20:52:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1664C433C8; Mon, 31 Jul 2023 20:52:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690836760; bh=4bc7n+F7Mq8FK6H3ud6CK8gDj85KBAh5RyJs5hitlVE=; h=Date:From:To:Cc:Subject:From; b=eY+wxcw6USz4xRYOjCO77U7nKEkA27D/Zyuj2zPsNqNtlV7JBnJPKdelD6sJYj/Yu HEmCgiW2eBi8t8hR2GBe6I7+rRu781RkvhmZ8wQkMr4sQpnVDDm3x9wi+3Ia+CIvOl Yyz8uxIVBuVESYD9GlfwIt7QDp0KSFpgh0uonfpC9bhDwYrrkhNa1/V0/iA70+GDCc 2Unsh5RZjyRXK4AwSs90QRSp7SBCHqS56k0J5LUW18dbsNVknT9wqMkV4fseaNDzwv PCl2uCrk7VkJJQCGffugV3PE3RWJXQ1lYtsAoXVgB2JiT8M673AMqIZgAAXGHCCGO5 8CNNqoweA9foQ== Date: Mon, 31 Jul 2023 14:53:44 -0600 From: "Gustavo A. R. Silva" To: Markus Mayer , Broadcom internal kernel review list , "Rafael J. Wysocki" , Viresh Kumar , Florian Fainelli Cc: linux-pm@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] cpufreq: brcmstb-avs-cpufreq: Fix -Warray-bounds bug Message-ID: MIME-Version: 1.0 Content-Disposition: inline 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,T_SCC_BODY_TEXT_LINE 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772972536089233932 X-GMAIL-MSGID: 1772972536089233932 Update the iteration conditions in the for() loop to avoid writing in array `table` beyond its allocated size. This fixes the following -Warray-bounds warning seen after building ARM with multi_v7_defconfig (GCC 13): In function 'brcm_avs_get_freq_table', inlined from 'brcm_avs_cpufreq_init' at drivers/cpufreq/brcmstb-avs-cpufreq.c:623:15: drivers/cpufreq/brcmstb-avs-cpufreq.c:449:28: warning: array subscript 5 is outside array bounds of 'void[60]' [-Warray-bounds=] 449 | table[i].frequency = CPUFREQ_TABLE_END; In file included from include/linux/node.h:18, from include/linux/cpu.h:17, from include/linux/cpufreq.h:12, from drivers/cpufreq/brcmstb-avs-cpufreq.c:44: In function 'devm_kmalloc_array', inlined from 'devm_kcalloc' at include/linux/device.h:328:9, inlined from 'brcm_avs_get_freq_table' at drivers/cpufreq/brcmstb-avs-cpufreq.c:437:10, inlined from 'brcm_avs_cpufreq_init' at drivers/cpufreq/brcmstb-avs-cpufreq.c:623:15: include/linux/device.h:323:16: note: at offset 60 into object of size 60 allocated by 'devm_kmalloc' 323 | return devm_kmalloc(dev, bytes, flags); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This helps with the ongoing efforts to tighten the FORTIFY_SOURCE routines on memcpy() and help us make progress towards globally enabling -Warray-bounds. Link: https://github.com/KSPP/linux/issues/324 Fixes: de322e085995 ("cpufreq: brcmstb-avs-cpufreq: AVS CPUfreq driver for Broadcom STB SoCs") Cc: stable@vger.kernel.org Signed-off-by: Gustavo A. R. Silva --- drivers/cpufreq/brcmstb-avs-cpufreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/cpufreq/brcmstb-avs-cpufreq.c b/drivers/cpufreq/brcmstb-avs-cpufreq.c index 1bdd513bcd19..99ba2d707eff 100644 --- a/drivers/cpufreq/brcmstb-avs-cpufreq.c +++ b/drivers/cpufreq/brcmstb-avs-cpufreq.c @@ -439,7 +439,7 @@ brcm_avs_get_freq_table(struct device *dev, struct private_data *priv) if (!table) return ERR_PTR(-ENOMEM); - for (i = AVS_PSTATE_P0; i <= AVS_PSTATE_MAX; i++) { + for (i = AVS_PSTATE_P0; i < AVS_PSTATE_MAX; i++) { ret = brcm_avs_set_pstate(priv, i); if (ret) return ERR_PTR(ret);