From patchwork Mon Oct 24 11:32:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9331 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp466039wru; Mon, 24 Oct 2022 06:54:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6nACLcdLn7DXwP+YE6HNBsYd2WkNpGDqyAVpvDlIs6BiM0JYrKC4MjlN3lZxg7I9g3BMPt X-Received: by 2002:a17:90a:cc0b:b0:213:cef:1ffc with SMTP id b11-20020a17090acc0b00b002130cef1ffcmr6544287pju.36.1666619643682; Mon, 24 Oct 2022 06:54:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666619643; cv=none; d=google.com; s=arc-20160816; b=NPStIk8fvHKv3jXdFP2L8Tf77VbClh0eEzzy7Mm3LPJt4DME7G3D9wEVZQubkrM/02 pWy+DSKYzPZe0nh+Go0B/lE9zSjxsrtuy2pH7Fvdk4i9bEg/NS66gG6Wi7Dyj1GwKNLF xalerg6RsvjYA/DfuY/+7jrubsZ3uwbFc9dKTmbgUaozWAt20SY5xMj5La+vCDb/KJM6 ME+smx/pPwGKqcFtZCDB92HMKjRDO6UuXkFniNGzK04Yg4FRF1S5aAhzsUbRUSbxEdGr u6gwH3qSlOxTFChQh2uT5uniD82c14mVqDnEgnc67WUWH+zlU1+7vvmh/I1uMr+CerTc wq2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BSw8g5AbWwNJRKU29yuOjOOMRM7+RWwlcZIruzWfjE0=; b=058PwwbTsXIY4vTnerqPmUcIOzOClI51F3F45gP8UgP7nB/vL7ASnJ2/tqqp3iYSpp w4mfizRUcDURKnRG5DbECc06vaeO0iw+gA9QsM3JqjIo7veQ0no3sVPgto2NDSPUOByi BrYrcZn6uNMDZre+8mWKDlavuRWSf6+cPPZN+aZr1FQZ4EXtmyN1uXGPYhC7Vurz33qY Y2vuUaGI7QQ8wfGat7/M4rwQ0H5UT9izWSMI+pV16mw/vs+uXWcHv0SVTHbDQUAM41cn 5k2GvU4zbRamx24SrTpjJfAgtexXMYWUMhKbXRKdCcTbCKkA/8jdp5rulTOYCk5MnG8g reBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YRqs9Lt4; 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=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p22-20020a639516000000b00437ec09f591si35430432pgd.135.2022.10.24.06.53.50; Mon, 24 Oct 2022 06:54:03 -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=@linuxfoundation.org header.s=korg header.b=YRqs9Lt4; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236701AbiJXNxa (ORCPT + 99 others); Mon, 24 Oct 2022 09:53:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236591AbiJXNwc (ORCPT ); Mon, 24 Oct 2022 09:52:32 -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 2A913BA902; Mon, 24 Oct 2022 05:42:59 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5FF1461280; Mon, 24 Oct 2022 12:32:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73716C43470; Mon, 24 Oct 2022 12:32:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614743; bh=HHUg5KckEKVunibn2u7StkIkV/6yefiT8qKsdvKKleE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YRqs9Lt4Nu4FqtNHQNP0vloQvemerN1pShKjvqJetLq6GdjoezL5mUQrHiHJvw19a rEZumvUTh1YO019o2Ek/IPpAukXnmiPloNDe6Bpdz03HecQzNMBrd2gNf5WIvowBy9 D/ibdM+/s1AFIo6TeIHIEF35PL3jqUQlj4nyCtr4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sergey Shtylyov , Will Deacon Subject: [PATCH 5.10 377/390] arm64: topology: fix possible overflow in amu_fie_setup() Date: Mon, 24 Oct 2022 13:32:54 +0200 Message-Id: <20221024113039.036524410@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747577359395508545?= X-GMAIL-MSGID: =?utf-8?q?1747577359395508545?= From: Sergey Shtylyov commit d4955c0ad77dbc684fc716387070ac24801b8bca upstream. cpufreq_get_hw_max_freq() returns max frequency in kHz as *unsigned int*, while freq_inv_set_max_ratio() gets passed this frequency in Hz as 'u64'. Multiplying max frequency by 1000 can potentially result in overflow -- multiplying by 1000ULL instead should avoid that... Found by Linux Verification Center (linuxtesting.org) with the SVACE static analysis tool. Fixes: cd0ed03a8903 ("arm64: use activity monitors for frequency invariance") Signed-off-by: Sergey Shtylyov Link: https://lore.kernel.org/r/01493d64-2bce-d968-86dc-11a122a9c07d@omp.ru Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kernel/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/arm64/kernel/topology.c +++ b/arch/arm64/kernel/topology.c @@ -158,7 +158,7 @@ static int validate_cpu_freq_invariance_ } /* Convert maximum frequency from KHz to Hz and validate */ - max_freq_hz = cpufreq_get_hw_max_freq(cpu) * 1000; + max_freq_hz = cpufreq_get_hw_max_freq(cpu) * 1000ULL; if (unlikely(!max_freq_hz)) { pr_debug("CPU%d: invalid maximum frequency.\n", cpu); return -EINVAL;