From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795023885; b=sNhP3ChcV+J8GJ9tyAzcak2AGyIE/VtTz9NdcMK9tUdI0gnhjMou/qS7wE+MmwiUXLsY ZUKbGjEcNJW2ridcBnrXIAx4g3OBW5znNVFXEhTPuwPQ9GkPxc8eDIsXnatokwq/LPADT 8xaGjH3EL8Klz5AsjKRgdvYYYjrtoC0ansTiacJNmbUKiwARj17o0dVJ3W1YP/E27LHu6 +PkM2MnzS5nsI/sSWWpy8PNPjREAigGDDeJ7XsAbSyYO4npkZnG56W0OMnGw63B4+yINu 11IiHnVyVbyjXKf6brtAiRPQoeWA/MmL4IPC4sY6sH447yZY4Ia5Ftr3ggyGshp6bpQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795023885; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=cO1BDsUmZIoRkXvqKsX1NmBkRXa1QkcBmC7wiZVl8uc=; b=UqKhaVCXAFE41RaWAJIhmhFFpW9cSWDU4FbYC1T3nua1N+5FTgCBBxM0r+ctHKuGXYf2 +2zazQvSPv3ICjZADsAInn48oB6X7rXqmchxFhmS9CjEH9mG1oX5/BquZvBxmhPLScG2W y0WzxlgtA0gvgxjh1KeNpHtYA/F07JoPRqaqCt3HGJQ2zb74q27j+W2BykK/cH6nJgAOv 1TcbKFoZZmrUv1/RdwmPkaWJWZxtxiC7IDYH40w+3UXngEL/U4wS431G1B/gl5Bap7pTp 3pLvqvylsymAaTqG8AQFj07/4ritjqfowp/4OgrlGS7VH33qHzvAQnjwanoAaRp7n+g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=JojeY7VJ; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3EE45606A320; Wed, 18 Nov 2026 17:44:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=JojeY7VJ Received: by smtp.kernel.org (Postfix) with ESMTPSA id 991AD1F000C4; Wed, 18 Nov 2026 17:44:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795023885; bh=cO1BDsUmZIoRkXvqKsX1NmBkRXa1QkcBmC7wiZVl8uc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JojeY7VJoWwJYhAjHEHKMfK/rnueacsicDC8b6eMRZbUtyWHCCUg4qiXgb8cNmDdh avY6dfqch2i937QX5vmtSGXIgzGmLCL1SZ7hbApAlqB7Xymw1HrAgVIVcZ+ibS2GKj XA4LXTG9PkqjPVicv5aED16QAc3y+S/rhMv2lAdg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sashiko , Christian Loehle , Sumit Gupta , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 6.18 0529/2151] ACPI: CPPC: Validate the _CPC package header Date: Wed, 18 Nov 2026 15:37:44 +0100 Message-ID: <20261118150141.295198814@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christian Loehle [ Upstream commit fb345025f161d17fe7c8a6048c7e80e467fa8ddf ] The _CPC NumEntries field includes every package element, including NumEntries and Revision. acpi_cppc_processor_probe() nevertheless reads those first two elements before checking that they exist and trusts NumEntries when walking the remaining elements. Reject packages with fewer than two elements and NumEntries values which exceed the package count before accessing Revision or iterating over register descriptors. Although the specification defines NumEntries as the number of package elements, tolerate additional trailing elements because ignoring them is safe and avoids rejecting padded firmware. Revision is specified as a BYTE, but the parser assigns its 64-bit AML Integer to an unsigned int before validating it. Reject values above U8_MAX before conversion so, for example, 0x100000004 cannot truncate to revision 4. Fixes: 337aadff8e45 ("ACPI: Introduce CPU performance controls using CPPC") Reported-by: Sashiko Link: https://sashiko.dev/#/patchset/20260724134251.1632824-1-christian.loehle%40arm.com Link: https://sashiko.dev/#/patchset/20260808082644.1251332-1-christian.loehle%40arm.com Signed-off-by: Christian Loehle Tested-by: Sumit Gupta Link: https://patch.msgid.link/20260916162805.1039247-2-christian.loehle@arm.com Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/cppc_acpi.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c index 2668004e89ec7..069159c86901c 100644 --- a/drivers/acpi/cppc_acpi.c +++ b/drivers/acpi/cppc_acpi.c @@ -727,6 +727,11 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) } out_obj = (union acpi_object *) output.pointer; + if (out_obj->package.count < 2) { + pr_debug("Unexpected _CPC package count (%u) for CPU:%d\n", + out_obj->package.count, pr->id); + goto out_buf_free; + } cpc_ptr = kzalloc(sizeof(struct cpc_desc), GFP_KERNEL); if (!cpc_ptr) { @@ -737,12 +742,15 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) /* First entry is NumEntries. */ cpc_obj = &out_obj->package.elements[0]; if (cpc_obj->type == ACPI_TYPE_INTEGER) { - num_ent = cpc_obj->integer.value; - if (num_ent <= 1) { - pr_debug("Unexpected _CPC NumEntries value (%d) for CPU:%d\n", - num_ent, pr->id); + if (cpc_obj->integer.value < 2 || + cpc_obj->integer.value > out_obj->package.count) { + pr_debug("Invalid _CPC NumEntries (%llu) for package count (%u) on CPU:%d\n", + cpc_obj->integer.value, out_obj->package.count, + pr->id); goto out_free; } + + num_ent = cpc_obj->integer.value; } else { pr_debug("Unexpected _CPC NumEntries entry type (%d) for CPU:%d\n", cpc_obj->type, pr->id); @@ -752,6 +760,12 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) /* Second entry should be revision. */ cpc_obj = &out_obj->package.elements[1]; if (cpc_obj->type == ACPI_TYPE_INTEGER) { + if (cpc_obj->integer.value > U8_MAX) { + pr_debug("Invalid _CPC Revision (%llu) for CPU:%d\n", + cpc_obj->integer.value, pr->id); + ret = -EINVAL; + goto out_free; + } cpc_rev = cpc_obj->integer.value; } else { pr_debug("Unexpected _CPC Revision entry type (%d) for CPU:%d\n", -- 2.53.0