github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-08-04 22:38:46 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'pci/iommu'

Browse Source 
- Fix a Time-of-Check to Time-of-Use issue when testing driver_managed_dma
  in the IOMMU probe path (Robin Murphy)

* pci/iommu:
  PCI: Fix driver_managed_dma check
This commit is contained in:
Bjorn Helgaas 2025-07-31 16:11:42 -05:00
commit 9fef768d86
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/pci/pci-driver.c
View File

@ -1628,7 +1628,7 @@ static int pci_bus_num_vf(struct device *dev)
*/
static int pci_dma_configure(struct device *dev)
{
struct pci_driver *driver = to_pci_driver(dev->driver);
const struct device_driver *drv = READ_ONCE(dev->driver);
struct device *bridge;
int ret = 0;
@ -1645,8 +1645,8 @@ static int pci_dma_configure(struct device *dev)
pci_put_host_bridge_device(bridge);
/* @driver may not be valid when we're called from the IOMMU layer */
if (!ret && dev->driver && !driver->driver_managed_dma) {
/* @drv may not be valid when we're called from the IOMMU layer */
if (!ret && drv && !to_pci_driver(drv)->driver_managed_dma) {
ret = iommu_device_use_default_domain(dev);
if (ret)
arch_teardown_dma_ops(dev);