[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20211006185842.GA1172531@bhelgaas>
Date: Wed, 6 Oct 2021 13:58:42 -0500
From: Bjorn Helgaas <helgaas@...nel.org>
To: "Rafael J. Wysocki" <rjw@...ysocki.net>
Cc: Linux PCI <linux-pci@...r.kernel.org>,
Linux ACPI <linux-acpi@...r.kernel.org>,
LKML <linux-kernel@...r.kernel.org>,
Niklas Schnelle <schnelle@...ux.ibm.com>,
Jesse Brandeburg <jesse.brandeburg@...el.com>,
Shanker Donthineni <sdonthineni@...dia.com>,
Alex Williamson <alex.williamson@...hat.com>
Subject: Re: [PATCH] PCI: ACPI: Check parent pointer in
acpi_pci_find_companion()
On Fri, Oct 01, 2021 at 03:58:10PM +0200, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
>
> If acpi_pci_find_companion() is called for a device whose parent
> pointer is NULL, it will crash when attempting to get the ACPI
> companion of the parent due to a NULL pointer dereference in
> the ACPI_COMPANION() macro.
>
> This was not a problem before commit 375553a93201 ("PCI: Setup ACPI
> fwnode early and at the same time with OF") that made pci_setup_device()
> call pci_set_acpi_fwnode() and so it allowed devices with NULL parent
> pointers to be passed to acpi_pci_find_companion() which is the case
> in pci_iov_add_virtfn(), for instance.
>
> Fix this issue by making acpi_pci_find_companion() check the device's
> parent pointer upfront and bail out if it is NULL.
>
> While pci_iov_add_virtfn() can be changed to set the device's parent
> pointer before calling pci_setup_device() for it, checking pointers
> against NULL before dereferencing them is prudent anyway and looking
> for ACPI companions of virtual functions isn't really useful.
>
> Fixes: 375553a93201 ("PCI: Setup ACPI fwnode early and at the same time with OF")
> Link: https://lore.kernel.org/linux-acpi/8e4bbd5c59de31db71f718556654c0aa077df03d.camel@linux.ibm.com/
> Reported-by: Niklas Schnelle <schnelle@...ux.ibm.com>
> Tested-by: Niklas Schnelle <schnelle@...ux.ibm.com>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
Acked-by: Bjorn Helgaas <bhelgaas@...gle.com>
> ---
> drivers/pci/pci-acpi.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> Index: linux-pm/drivers/pci/pci-acpi.c
> ===================================================================
> --- linux-pm.orig/drivers/pci/pci-acpi.c
> +++ linux-pm/drivers/pci/pci-acpi.c
> @@ -1243,6 +1243,9 @@ static struct acpi_device *acpi_pci_find
> bool check_children;
> u64 addr;
>
> + if (!dev->parent)
> + return NULL;
> +
> down_read(&pci_acpi_companion_lookup_sem);
>
> adev = pci_acpi_find_companion_hook ?
>
>
>
Powered by blists - more mailing lists