From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: Lukas Wunner <lukas@wunner.de>
Cc: Bjorn Helgaas <helgaas@kernel.org>,
Keith Busch <kbusch@kernel.org>,
linux-pci@vger.kernel.org
Subject: Re: [PATCH] PCI/DPC: Fix use-after-free on concurrent DPC and hot-removal
Date: Tue, 18 Jun 2024 14:37:09 +0300 [thread overview]
Message-ID: <20240618113709.GB1532424@black.fi.intel.com> (raw)
In-Reply-To: <8e4bcd4116fd94f592f2bf2749f168099c480ddf.1718707743.git.lukas@wunner.de>
On Tue, Jun 18, 2024 at 12:54:55PM +0200, Lukas Wunner wrote:
> Keith reports a use-after-free when a DPC event occurs concurrently to
> hot-removal of the same portion of the hierarchy:
>
> The dpc_handler() awaits readiness of the secondary bus below the
> Downstream Port where the DPC event occurred. To do so, it polls the
> config space of the first child device on the secondary bus. If that
> child device is concurrently removed, accesses to its struct pci_dev
> cause the kernel to oops.
>
> That's because pci_bridge_wait_for_secondary_bus() neglects to hold a
> reference on the child device. Before v6.3, the function was only
> called on resume from system sleep or on runtime resume. Holding a
> reference wasn't necessary back then because the pciehp IRQ thread
> could never run concurrently. (On resume from system sleep, IRQs are
> not enabled until after the resume_noirq phase. And runtime resume is
> always awaited before a PCI device is removed.)
>
> However starting with v6.3, pci_bridge_wait_for_secondary_bus() is also
> called on a DPC event. Commit 53b54ad074de ("PCI/DPC: Await readiness
> of secondary bus after reset"), which introduced that, failed to
> appreciate that pci_bridge_wait_for_secondary_bus() now needs to hold a
> reference on the child device because dpc_handler() and pciehp may
> indeed run concurrently. The commit was backported to v5.10+ stable
> kernels, so that's the oldest one affected.
>
> Add the missing reference acquisition.
>
> Abridged stack trace:
>
> BUG: unable to handle page fault for address: 00000000091400c0
> CPU: 15 PID: 2464 Comm: irq/53-pcie-dpc 6.9.0
> RIP: pci_bus_read_config_dword+0x17/0x50
> pci_dev_wait()
> pci_bridge_wait_for_secondary_bus()
> dpc_reset_link()
> pcie_do_recovery()
> dpc_handler()
>
> Fixes: 53b54ad074de ("PCI/DPC: Await readiness of secondary bus after reset")
> Reported-by: Keith Busch <kbusch@kernel.org>
> Closes: https://lore.kernel.org/r/20240612181625.3604512-3-kbusch@meta.com/
> Tested-by: Keith Busch <kbusch@kernel.org>
> Signed-off-by: Lukas Wunner <lukas@wunner.de>
> Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
next prev parent reply other threads:[~2024-06-18 11:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-18 10:54 [PATCH] PCI/DPC: Fix use-after-free on concurrent DPC and hot-removal Lukas Wunner
2024-06-18 11:37 ` Mika Westerberg [this message]
2024-06-18 16:12 ` Keith Busch
2024-06-18 16:56 ` Lukas Wunner
2024-06-26 19:38 ` Keith Busch
2024-07-01 20:26 ` Krzysztof Wilczyński
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=20240618113709.GB1532424@black.fi.intel.com \
--to=mika.westerberg@linux.intel.com \
--cc=helgaas@kernel.org \
--cc=kbusch@kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lukas@wunner.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.