| Message ID | ZMh45KH2iPIpNktr@work |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2432880vqg;
Mon, 31 Jul 2023 21:26:34 -0700 (PDT)
X-Google-Smtp-Source:
APBJJlGfNtQuRiLekARmGU8b0mmt60om6jXxQM+umaf3Bai2Y70xUXXJjnGfMXluLHl8aOtbtMhE
X-Received: by 2002:a05:6808:1385:b0:3a7:44da:d5e4 with SMTP id
c5-20020a056808138500b003a744dad5e4mr3338880oiw.51.1690863994065;
Mon, 31 Jul 2023 21:26:34 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1690863994; cv=none;
d=google.com; s=arc-20160816;
b=C4IVMHtS2DoM+kQItCmlwicxtpBKPDBcTm24K9P/h/laXAWoMDKHGx0Z8hWGEORDw6
Bf+Po/sTclhkjNlYjq00qnGoqfJ1Or/ejZ2I2szConU++fVAXtGJ5XGt93/HFNbvH7oG
M1qyrENHZxsuFT2eZ1eHCMeRqD0tZh3TjLXBfs02LslH06wmOIhjUQBxhdi44SRBe/QQ
ap+POHQxgCk1OY08UOk9JRRTKAg4V0hYGeTCc7VBJZCQmCDnKv9VQH4qc5pIemOakrGx
t2R6NlkDw/GL39tjUDO5JyG7GB5UNx+4yHH8Z+jfdIgUkbz7MXTi7bKvaeLtqjiGwlP6
zl2Q==
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=NYpq9pHltZKaDQHe7wJSReRpl29GeCDjZp2Emb6zosc=;
fh=xE2RgtHbG/ANluWnxVTSXg3H6dD75nsBBZFX40zOmn8=;
b=qrmkgaCM+8MN2sEBpXTDlpWwjMk+XPB8HJPZUQAOpUobauiUEWMgjk+lceH8q+rtY0
IxWfPtUPFFh2e2GkXNknfGKEB92JYz3ziESZpyj3zYI26W7YczDuZE/G6NuG+7yEecH/
QywzX+Zi9bXRKCKQuLUKEpbCn2dbeAvZ+Oe6IdNqv6RXrRN5/ZeT8oF+oo8tFS6D4zPc
pZT6fKczcROOEMx9rAJtavVdlP5fKlGQBb6n8gW/NTmu9FiMQgbFxq6+6GrhZItSsl/G
m3dbdjEijhu/hnW1mbp6NE2/dNrdhywiNjR53oqFA49Wlmrsd+TBH5QuJM/nBKgg34GA
edfg==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jhgy7qjl;
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
gq1-20020a17090b104100b00267ba1c43adsi8500376pjb.101.2023.07.31.21.26.20;
Mon, 31 Jul 2023 21:26:34 -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=jhgy7qjl;
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 S230301AbjHADOs (ORCPT <rfc822;maxi.paulin@gmail.com>
+ 99 others); Mon, 31 Jul 2023 23:14:48 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47346 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229705AbjHADOr (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Mon, 31 Jul 2023 23:14:47 -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 136751BC6;
Mon, 31 Jul 2023 20:14:46 -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 4FBB1613F1;
Tue, 1 Aug 2023 03:14:45 +0000 (UTC)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 471FCC433C7;
Tue, 1 Aug 2023 03:14:43 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
s=k20201202; t=1690859684;
bh=2oC1axryfLbP+TCpiGARmMNZzsq4UdhTAH2upeuRKAQ=;
h=Date:From:To:Cc:Subject:From;
b=jhgy7qjl3QW+L8CbNw51tigS3tZSBhG/HYf3GSvbGrG3bvuUXIa/O+KxEDzuqxlod
P8B56Hd4b+zcdPWEl5IIGHS6UoGsWvbbuG9jthVc6U5+CKsvVXqkXKVRTkA8gx81p9
ahh31yEXdFxO045zP3A+quMQTM+aM9TI4K/rkEgpe1E6RdmezYfXDdO4Tn+w5m9Bas
XFVjng3yIRffZ5v7IeaTcSHDdcv2ek+Jyb9ZrfH66rbmdDSSOiB0PTJkkHSvCMG6hd
qy96KAHE9irZRKpqFW2bwKRYnYYizmAT4y/7O1TtLwzNm2i7b+KWFr6aA5gdk/fycJ
fvHH2fzbvPD/Q==
Date: Mon, 31 Jul 2023 21:15:48 -0600
From: "Gustavo A. R. Silva" <gustavoars@kernel.org>
To: Markus Mayer <mmayer@broadcom.com>,
Broadcom internal kernel review list
<bcm-kernel-feedback-list@broadcom.com>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Viresh Kumar <viresh.kumar@linaro.org>,
Florian Fainelli <florian.fainelli@broadcom.com>
Cc: linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
linux-hardening@vger.kernel.org, Kees Cook <keescook@chromium.org>
Subject: [PATCH v3] cpufreq: brcmstb-avs-cpufreq: Fix -Warray-bounds bug
Message-ID: <ZMh45KH2iPIpNktr@work>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
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,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1772972536089233932
X-GMAIL-MSGID: 1772999403738102640
|
| Series |
[v3] cpufreq: brcmstb-avs-cpufreq: Fix -Warray-bounds bug
|
|
Commit Message
Gustavo A. R. Silva
Aug. 1, 2023, 3:15 a.m. UTC
Allocate extra space for terminating element at:
drivers/cpufreq/brcmstb-avs-cpufreq.c:
449 table[i].frequency = CPUFREQ_TABLE_END;
and add code comment to make this clear.
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 <gustavoars@kernel.org>
---
Changes in v3:
- Allocate extra space for a terminating element. (Kees Cook)
- Update changelog text.
Changes in v2:
- Update changelog text. Add more details.
- Link: https://lore.kernel.org/linux-hardening/202307311610.B1EB796684@keescook/
v1:
- Link: https://lore.kernel.org/linux-hardening/ZMgfWEA0GAN%2FRog8@work/
drivers/cpufreq/brcmstb-avs-cpufreq.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
Comments
On 7/31/23 20:15, Gustavo A. R. Silva wrote: > Allocate extra space for terminating element at: > > drivers/cpufreq/brcmstb-avs-cpufreq.c: > 449 table[i].frequency = CPUFREQ_TABLE_END; > > and add code comment to make this clear. > > 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 <gustavoars@kernel.org> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
On 01-08-23, 10:05, Florian Fainelli wrote: > On 7/31/23 20:15, Gustavo A. R. Silva wrote: > > Allocate extra space for terminating element at: > > > > drivers/cpufreq/brcmstb-avs-cpufreq.c: > > 449 table[i].frequency = CPUFREQ_TABLE_END; > > > > and add code comment to make this clear. > > > > 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 <gustavoars@kernel.org> > > Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Applied. Thanks.
On 8/2/23 23:56, Viresh Kumar wrote: > > Applied. Thanks. > Great. :) Thank you -- Gustavo
diff --git a/drivers/cpufreq/brcmstb-avs-cpufreq.c b/drivers/cpufreq/brcmstb-avs-cpufreq.c index ffea6402189d..3052949aebbc 100644 --- a/drivers/cpufreq/brcmstb-avs-cpufreq.c +++ b/drivers/cpufreq/brcmstb-avs-cpufreq.c @@ -434,7 +434,11 @@ brcm_avs_get_freq_table(struct device *dev, struct private_data *priv) if (ret) return ERR_PTR(ret); - table = devm_kcalloc(dev, AVS_PSTATE_MAX + 1, sizeof(*table), + /* + * We allocate space for the 5 different P-STATES AVS, + * plus extra space for a terminating element. + */ + table = devm_kcalloc(dev, AVS_PSTATE_MAX + 1 + 1, sizeof(*table), GFP_KERNEL); if (!table) return ERR_PTR(-ENOMEM);