Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp1970107rwe; Fri, 2 Sep 2022 06:46:59 -0700 (PDT) X-Google-Smtp-Source: AA6agR7fVYoO93wDYCurIA1MOGhXUZkve0MosaW6s+K+kqp2tM9cGUpCV2vc++wGVO5yZjaXMyig X-Received: by 2002:a63:6a05:0:b0:42a:3dd6:d916 with SMTP id f5-20020a636a05000000b0042a3dd6d916mr30264396pgc.345.1662126418841; Fri, 02 Sep 2022 06:46:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662126418; cv=none; d=google.com; s=arc-20160816; b=Jag6ephYkH84NRlF19rYDrrnCYOgANUplwJ4CF3W/3PCqc6KYf1I2ij+USlb3tjJTt uAdEpRqoFAMdznIIC28rZ6WrsDcM3q//AS/oAfCf9lXTT0r+VfAoOgkFTIkZzxTBJXR6 sPvUvkAVmscG0hBxtRj8pbP+/i83Uspp0RYTC+CgBvBwIXjlLpk5WBnSrf6gTLRFSXyK cR7k1xeo3CHtpugImozU03yWxHesZR+wjaKQF8nb8D5ASYDbmT7JWJHHej4ldKGPxQww 24CRR8o2PGaxJpdGGzWO++b5898+2oxR9O54Kiec0EZbzORe26OAPu7vdEKnq10eNQcY r4Og== 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=FBEeDG9Ks8ZuD4SutuM1ghAnADSEcILoD4iDRbV9+ew=; b=E7T9m/20lPNN+RD6I/vokC/pSHL4rMOrQQg62/chOgfMaTUuorA+zDKltGQq5rbkNw UlihOJ56GntnVVrZjVoDQ8ks/w0vqvP7h0vmojZMz1K0BYUYWKdvhvd4lh+gh2vS5yFX iBgF1T+hArplprszIIYa1zc6Rz7ZTL9Fik+U7q9xRMMhExHg85vys3q3DZPk+Te8rNvs GRrYkpXmTmcMhB6D8Jz7I9JjhC3yfPN+Z+SUeyYujEnLAakqh690Lqkh7dLTdlktUDlm HdirgE3wjCoCKLVDmXaaweHTow+Kll8B4ZmbZomaAAt/12durJ1BE329xXZM2+bNGeln Ahtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=hXpB0CWt; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h130-20020a636c88000000b004301e6b2ec3si1840857pgc.607.2022.09.02.06.46.45; Fri, 02 Sep 2022 06:46:58 -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=hXpB0CWt; 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 S237743AbiIBMz7 (ORCPT + 99 others); Fri, 2 Sep 2022 08:55:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238132AbiIBMx4 (ORCPT ); Fri, 2 Sep 2022 08:53:56 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 658DDE394C; Fri, 2 Sep 2022 05:38:25 -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 ams.source.kernel.org (Postfix) with ESMTPS id 2090FB82ADB; Fri, 2 Sep 2022 12:38:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51794C433C1; Fri, 2 Sep 2022 12:38:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1662122286; bh=5g9JY2Gz2Jm4NNrnqoRRHvvbwd4YFiYpKQ3LyeEkhgc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hXpB0CWthtEpvBrBtE7dv0vT28CmW65PCipzRc8v1i9YwmbavXzWLV793DzorGWpc Pg6YwTIXogYK3PWpxSI7Jf5bQGSMULQzqgfNSKKBTv3gxuR+Wtzcv1AvPOOnCHGPjf R85tsJSZIEDtldWw8R0S7G7hGCDxxMne7QU1oNJI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sudeep Holla , Will Deacon , Bruno Goncalves Subject: [PATCH 5.19 72/72] arm64: cacheinfo: Fix incorrect assignment of signed error value to unsigned fw_level Date: Fri, 2 Sep 2022 14:19:48 +0200 Message-Id: <20220902121407.183705625@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220902121404.772492078@linuxfoundation.org> References: <20220902121404.772492078@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 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,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 From: Sudeep Holla commit e75d18cecbb3805895d8ed64da4f78575ec96043 upstream. Though acpi_find_last_cache_level() always returned signed value and the document states it will return any errors caused by lack of a PPTT table, it never returned negative values before. Commit 0c80f9e165f8 ("ACPI: PPTT: Leave the table mapped for the runtime usage") however changed it by returning -ENOENT if no PPTT was found. The value returned from acpi_find_last_cache_level() is then assigned to unsigned fw_level. It will result in the number of cache leaves calculated incorrectly as a huge value which will then cause the following warning from __alloc_pages as the order would be great than MAX_ORDER because of incorrect and huge cache leaves value. | WARNING: CPU: 0 PID: 1 at mm/page_alloc.c:5407 __alloc_pages+0x74/0x314 | Modules linked in: | CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.19.0-10393-g7c2a8d3ac4c0 #73 | pstate: 20000005 (nzCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) | pc : __alloc_pages+0x74/0x314 | lr : alloc_pages+0xe8/0x318 | Call trace: | __alloc_pages+0x74/0x314 | alloc_pages+0xe8/0x318 | kmalloc_order_trace+0x68/0x1dc | __kmalloc+0x240/0x338 | detect_cache_attributes+0xe0/0x56c | update_siblings_masks+0x38/0x284 | store_cpu_topology+0x78/0x84 | smp_prepare_cpus+0x48/0x134 | kernel_init_freeable+0xc4/0x14c | kernel_init+0x2c/0x1b4 | ret_from_fork+0x10/0x20 Fix the same by changing fw_level to be signed integer and return the error from init_cache_level() early in case of error. Reported-and-Tested-by: Bruno Goncalves Signed-off-by: Sudeep Holla Link: https://lore.kernel.org/r/20220808084640.3165368-1-sudeep.holla@arm.com Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kernel/cacheinfo.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/arch/arm64/kernel/cacheinfo.c +++ b/arch/arm64/kernel/cacheinfo.c @@ -45,7 +45,8 @@ static void ci_leaf_init(struct cacheinf int init_cache_level(unsigned int cpu) { - unsigned int ctype, level, leaves, fw_level; + unsigned int ctype, level, leaves; + int fw_level; struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu); for (level = 1, leaves = 0; level <= MAX_CACHE_LEVEL; level++) { @@ -63,6 +64,9 @@ int init_cache_level(unsigned int cpu) else fw_level = acpi_find_last_cache_level(cpu); + if (fw_level < 0) + return fw_level; + if (level < fw_level) { /* * some external caches not specified in CLIDR_EL1