diff options
| author | Linus Torvalds <[email protected]> | 2022-12-02 23:54:12 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2022-12-02 23:54:12 +0000 |
| commit | f66f62f83dba3ec4237c3dd7a95b776824ac91a0 (patch) | |
| tree | 20a3193ade3b0f11ebac8c4b11aa77dcd967f42c /drivers/iommu/intel/dmar.c | |
| parent | x86/bugs: Make sure MSR_SPEC_CTRL is updated properly upon resume from S3 (diff) | |
| parent | iommu/vt-d: Fix PCI device refcount leak in dmar_dev_scope_init() (diff) | |
| download | kernel-f66f62f83dba3ec4237c3dd7a95b776824ac91a0.tar.gz kernel-f66f62f83dba3ec4237c3dd7a95b776824ac91a0.zip | |
Merge tag 'iommu-fixes-v6.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull iommu fixes from Joerg Roedel:
"Intel VT-d fixes:
- IO/TLB flush fix
- Various pci_dev refcount fixes"
* tag 'iommu-fixes-v6.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/vt-d: Fix PCI device refcount leak in dmar_dev_scope_init()
iommu/vt-d: Fix PCI device refcount leak in has_external_pci()
iommu/vt-d: Fix PCI device refcount leak in prq_event_thread()
iommu/vt-d: Add a fix for devices need extra dtlb flush
Diffstat (limited to 'drivers/iommu/intel/dmar.c')
| -rw-r--r-- | drivers/iommu/intel/dmar.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c index 5a8f780e7ffd..bc94059a5b87 100644 --- a/drivers/iommu/intel/dmar.c +++ b/drivers/iommu/intel/dmar.c @@ -820,6 +820,7 @@ int __init dmar_dev_scope_init(void) info = dmar_alloc_pci_notify_info(dev, BUS_NOTIFY_ADD_DEVICE); if (!info) { + pci_dev_put(dev); return dmar_dev_scope_status; } else { dmar_pci_bus_add_dev(info); |