Linux PCI subsystem development
 help / color / mirror / Atom feed
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 v13 05/12] ACPI: x86: s2idle: Catch multiple ACPI_TYPE_PACKAGE objects
Date: Fri, 18 Aug 2023 00:13:12 -0500	[thread overview]
Message-ID: <20230818051319.551-6-mario.limonciello@amd.com> (raw)
In-Reply-To: <20230818051319.551-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


  parent reply	other threads:[~2023-08-18  5:16 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-18  5:13 [PATCH v13 00/12] Fix wakeup problems on some AMD platforms Mario Limonciello
2023-08-18  5:13 ` [PATCH v13 01/12] PCI: Only put Intel PCIe ports >= 2015 into D3 Mario Limonciello
2023-08-18  8:12   ` Rafael J. Wysocki
2023-08-18  8:21     ` David Laight
2023-08-18  9:19       ` Rafael J. Wysocki
2023-08-18 13:54         ` Mario Limonciello
2023-08-18 14:19   ` Kuppuswamy Sathyanarayanan
2023-08-18  5:13 ` [PATCH v13 02/12] ACPI: Add comments to clarify some #ifdef statements Mario Limonciello
2023-08-18  5:13 ` [PATCH v13 03/12] ACPI: Adjust #ifdef for *_lps0_dev use Mario Limonciello
2023-08-18  5:13 ` [PATCH v13 04/12] ACPI: x86: s2idle: Post-increment variables when getting constraints Mario Limonciello
2023-08-18  5:13 ` Mario Limonciello [this message]
2023-08-18  5:13 ` [PATCH v13 06/12] ACPI: x86: s2idle: Fix a logic error parsing AMD constraints table Mario Limonciello
2023-08-18  5:13 ` [PATCH v13 07/12] ACPI: x86: s2idle: Add more debugging for AMD constraints parsing Mario Limonciello
2023-08-18  5:13 ` [PATCH v13 08/12] ACPI: x86: s2idle: Add for_each_lpi_constraint() helper Mario Limonciello
2023-08-18  5:13 ` [PATCH v13 09/12] ACPI: x86: s2idle: Add a function to get constraints for a device Mario Limonciello
2023-08-18  8:31   ` Rafael J. Wysocki
2023-08-18 10:47     ` Andy Shevchenko
2023-08-18 14:04       ` Mario Limonciello
2023-08-18 15:38         ` Rafael J. Wysocki
2023-08-18 15:47           ` Andy Shevchenko
2023-08-18 15:47           ` Rafael J. Wysocki
2023-08-18  5:13 ` [PATCH v13 10/12] PCI: ACPI: Add helper functions for converting ACPI <->PCI states Mario Limonciello
2023-08-18  5:13 ` [PATCH v13 11/12] PCI: ACPI: Use device constraints to opt devices into D3 support Mario Limonciello
2023-08-18 16:06   ` Rafael J. Wysocki
2023-08-18  5:13 ` [PATCH v13 12/12] PCI: ACPI: Limit the Intel specific opt-in to D3 to 2024 Mario Limonciello
2023-08-18 16:09   ` Rafael J. Wysocki
2023-08-18  8:06 ` [PATCH v13 00/12] Fix wakeup problems on some AMD platforms Rafael J. Wysocki
2023-08-18 13:53   ` Mario Limonciello

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=20230818051319.551-6-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