From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B7A64CDDFE; Thu, 17 Sep 2026 17:54:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789667656; cv=none; b=p1WPwKsoubKoY57Of7QgXDmI0OhCoQPQVH/EEWZWhROK6b6K8/c1HQ2+7AeV9AxekeiilzQDySzZUPuJfKmBz9mG2/MVakuyWFeDXpYEj8ERbEzrW/h7UhIXVtOIZMzNpL20Jrl0BYkNY0ol2LVgGye7Vxo5RT1jj63B3pRVr6M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789667656; c=relaxed/simple; bh=TX0j4ffWBxZNHwYPLTef9A7FpHNCpWNqUN1wbfZDlPc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G2YxrRjbZCFy+l2Pv7L3ivMSHSquJfO4LgiDdNg5jUNyuv7LElHOO9YtDoOyTO3nBRQ9QPJOWoQu1owITRMGYGFitbkzohaax5QGCdc5d/fKzsQFV4vivgCmkTFq/XIb8PLDylwdTBgx0MNExGxm7rmBTMmsX2xFkRK5vUy6PXc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=s9MrrHJ1; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="s9MrrHJ1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 79D271F000FF; Thu, 17 Sep 2026 17:54:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789667655; bh=Aim+vZFPI/60CS1K664tOJohEWJH4RysJFkTN8Pxpuk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=s9MrrHJ1DcUAuTn0KIch3b3mqnVotY0jZr3B/TTKYsu728AT2p7ITlD8yli1svwPF Oq8nTsfZeJmGm0L+Ve6FmfguOfphbIMHOuJ3czXtqhX3JF8hBAA7nH2VTd7P711s+u 8bX2c8SswRGKC8udKEjr8CkPdRiT0aRY2BVLwZhs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, ikaros , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 6.12 0164/1102] ACPICA: validate byte_count in acpi_ps_get_next_package_length() Date: Thu, 17 Sep 2026 16:01:47 +0100 Message-ID: <20260917151543.654554663@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260917151539.408551884@linuxfoundation.org> References: <20260917151539.408551884@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: ikaros [ Upstream commit d49c6ee08365a8596f639da46eb7e71752b0cd42 ] Validate package length reading in acpi_ps_get_next_package_length(). Link: https://github.com/acpica/acpica/commit/40e03f9941e2 Signed-off-by: ikaros Signed-off-by: Rafael J. Wysocki Link: https://patch.msgid.link/3616255.QJadu78ljV@rafael.j.wysocki Signed-off-by: Sasha Levin --- drivers/acpi/acpica/psargs.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/acpi/acpica/psargs.c b/drivers/acpi/acpica/psargs.c index 251f3eacb83d1..095cbb77a3fc1 100644 --- a/drivers/acpi/acpica/psargs.c +++ b/drivers/acpi/acpica/psargs.c @@ -48,6 +48,7 @@ acpi_ps_get_next_package_length(struct acpi_parse_state *parser_state) u32 package_length = 0; u32 byte_count; u8 byte_zero_mask = 0x3F; /* Default [0:5] */ + u32 remaining; ACPI_FUNCTION_TRACE(ps_get_next_package_length); @@ -55,7 +56,23 @@ acpi_ps_get_next_package_length(struct acpi_parse_state *parser_state) * Byte 0 bits [6:7] contain the number of additional bytes * used to encode the package length, either 0,1,2, or 3 */ + + /* Check if we have at least one byte to read */ + remaining = (u32)ACPI_PTR_DIFF(parser_state->aml_end, aml); + if (remaining == 0) { + return_UINT32(0); + } + byte_count = (aml[0] >> 6); + + /* Validate byte_count and ensure we have enough bytes to read */ + if (byte_count >= remaining) { + + /* Clamp to available bytes and advance to end */ + parser_state->aml = parser_state->aml_end; + return_UINT32(0); + } + parser_state->aml += ((acpi_size)byte_count + 1); /* Get bytes 3, 2, 1 as needed */ -- 2.53.0