From: Mario Limonciello <mario.limonciello@amd.com>
To: "Rafael J . Wysocki" <rafael@kernel.org>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Bjorn Helgaas <helgaas@kernel.org>
Cc: <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
"Andy Shevchenko" <andriy.shevchenko@linux.intel.com>,
<linux-acpi@vger.kernel.org>,
Kuppuswamy Sathyanarayanan
<sathyanarayanan.kuppuswamy@linux.intel.com>,
"Iain Lane" <iain@orangesquash.org.uk>,
Shyam-sundar S-k <Shyam-sundar.S-k@amd.com>,
Mario Limonciello <mario.limonciello@amd.com>
Subject: [PATCH v12 4/9] ACPI: x86: s2idle: Catch multiple ACPI_TYPE_PACKAGE objects
Date: Wed, 16 Aug 2023 15:41:38 -0500 [thread overview]
Message-ID: <20230816204143.66281-5-mario.limonciello@amd.com> (raw)
In-Reply-To: <20230816204143.66281-1-mario.limonciello@amd.com>
If a badly constructed firmware includes multiple `ACPI_TYPE_PACKAGE`
objects while evaluating the AMD LPS0 _DSM, there will be a memory
leak. Explicitly guard against this.
Suggested-by: Bjorn Helgaas <helgaas@kernel.org>
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
drivers/acpi/x86/s2idle.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c
index 7711dde68947f..508decbac2986 100644
--- a/drivers/acpi/x86/s2idle.c
+++ b/drivers/acpi/x86/s2idle.c
@@ -113,6 +113,12 @@ static void lpi_device_get_constraints_amd(void)
union acpi_object *package = &out_obj->package.elements[i];
if (package->type == ACPI_TYPE_PACKAGE) {
+ if (lpi_constraints_table) {
+ acpi_handle_err(lps0_device_handle,
+ "Duplicate constraints list\n");
+ goto free_acpi_buffer;
+ }
+
lpi_constraints_table = kcalloc(package->package.count,
sizeof(*lpi_constraints_table),
GFP_KERNEL);
--
2.34.1
next prev parent reply other threads:[~2023-08-16 22:11 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-16 20:41 [PATCH v12 0/9] Fix wakeup problems on some AMD platforms Mario Limonciello
2023-08-16 20:41 ` [PATCH v12 1/9] ACPI: Add comments to clarify some #ifdef statements Mario Limonciello
2023-08-16 22:36 ` Kuppuswamy Sathyanarayanan
2023-08-16 20:41 ` [PATCH v12 2/9] ACPI: Adjust #ifdef for *_lps0_dev use Mario Limonciello
2023-08-16 22:38 ` Kuppuswamy Sathyanarayanan
2023-08-16 20:41 ` [PATCH v12 3/9] ACPI: x86: s2idle: Post-increment variables when getting constraints Mario Limonciello
2023-08-17 2:42 ` Kuppuswamy Sathyanarayanan
2023-08-17 10:10 ` Andy Shevchenko
2023-08-17 15:28 ` Kuppuswamy Sathyanarayanan
2023-08-17 15:52 ` Andy Shevchenko
2023-08-16 20:41 ` Mario Limonciello [this message]
2023-08-16 20:41 ` [PATCH v12 5/9] ACPI: x86: s2idle: Fix a logic error parsing AMD constraints table Mario Limonciello
2023-08-16 20:41 ` [PATCH v12 6/9] ACPI: x86: s2idle: Add more debugging for AMD constraints parsing Mario Limonciello
2023-08-16 20:41 ` [PATCH v12 7/9] ACPI: x86: s2idle: Store if constraint is enabled Mario Limonciello
2023-08-16 20:41 ` [PATCH v12 8/9] ACPI: x86: s2idle: Add for_each_lpi_constraint() helper Mario Limonciello
2023-08-16 20:41 ` [PATCH v12 9/9] ACPI: x86: s2idle: Enforce LPS0 constraints for PCI devices Mario Limonciello
2023-08-17 5:03 ` kernel test robot
2023-08-17 19:25 ` Bjorn Helgaas
2023-08-17 19:30 ` Limonciello, Mario
2023-08-17 19:37 ` Rafael J. Wysocki
2023-08-17 19:40 ` Limonciello, Mario
2023-08-17 19:53 ` Rafael J. Wysocki
2023-08-17 19:31 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230816204143.66281-5-mario.limonciello@amd.com \
--to=mario.limonciello@amd.com \
--cc=Shyam-sundar.S-k@amd.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=helgaas@kernel.org \
--cc=iain@orangesquash.org.uk \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=rafael@kernel.org \
--cc=sathyanarayanan.kuppuswamy@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®