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=1795055160; b=EahuW0hdLnAJTt9Rtsdw2ie+ukyjgGqI+2NDwc9rIP1EmFRMzUF4hYbow7ncWRSIiIK6 aJzLlhcLsBX3sfd/CKDdYGuXmrHGsuDSj4R1mPkpKYaMoBId0opqydJQOqbINzkjFfEgw XWGiZMxQGi7KyRRxg0u6Y/uQng63mg/38NhsPhszY/WucDbJoCQdsKgia2EYglEfuAmvz aRvBt+mlPNLyET19mpsROKFAwZX9QodBg7zUegjhFpNvLIAErfnr1wSgYAnjZxP/pKRPZ VX0vBFaxEbH44w8N8Ubh58C2YvQFnm/mGtShIe9k5jhW/xHfzpz1F1OXeLlVlqsX4CA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795055160; 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=Qe2O93fuFXqaVgLncVz7r3jl1yrLFVLyKef2h9dCh94=; b=fxwTjEUN1mYFQfYuc6TaWZ8VgeXmLTzika41RuFLvmS8EXdzUjdNun74vzpnTSxjIk7R FEH1g6dCcP7jUebaqFZNEkv0O0HOlq7SPMOCccnSCQQvQc+0PoojJtzptr7mhi8NF2J8u OivDeaz9TPppIkLUIMNG+xC2fGhdEK1O7eWxdMtlolLFsvpRK4pidicj2nTgBZ+vU7yo3 d+h+BAlEZFzE7wYsw5MbiA3tnCDK/Dcns7QOK2T1YhDV/L3QU6swbZxYh7sNrMgKK23tO H6YIELs4r12SEDpzgKzJUZQHwm7dtvksfhgDLsDF/HXxDq/uEzGtpFQSyfxwX5HU8kg== 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="kibOlW/g"; 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 5883E606A325; Thu, 19 Nov 2026 02:26:00 +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=kibOlW/g Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2B401F000C4; Thu, 19 Nov 2026 02:25:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795055160; bh=Qe2O93fuFXqaVgLncVz7r3jl1yrLFVLyKef2h9dCh94=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kibOlW/gyoGl66onna2qlp/Vx6ERmTaitzdRI1xNLBTwsMX6bo64lX81q9ThZ2Wyx YOlNjldXMHgsTKX5QYBKnuTFDqFVGSU+PqZtlSzlgvrlXmkKkZEuM2/O2G4rT4jrL4 Wib7roFnGHOneIT6kTkleMQNXF5los8Lrv88SkD0= 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 5.15 1532/2214] ACPI: CPPC: Validate the _CPC package header Date: Wed, 18 Nov 2026 15:53:28 +0100 Message-ID: <20261118150113.462526138@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-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 c51183c2fd6f3..f9e3232067bc1 100644 --- a/drivers/acpi/cppc_acpi.c +++ b/drivers/acpi/cppc_acpi.c @@ -693,6 +693,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) { @@ -703,12 +708,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 entry type(%d) for NumEntries\n", cpc_obj->type); @@ -718,6 +726,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 entry type(%d) for Revision\n", -- 2.53.0