This is a note to let you know that I've just added the patch titled
iommu/vt-d: Fix dmar_domain leak in iommu_attach_device
to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
iommu-vt-d-fix-dmar_domain-leak-in-iommu_attach_device.patch
and it can be found in the queue-3.18 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 62c22167dd70b730f61c2b88f950e98154a87980 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <jroedel@xxxxxxx>
Date: Tue, 9 Dec 2014 12:56:45 +0100
Subject: iommu/vt-d: Fix dmar_domain leak in iommu_attach_device
From: Joerg Roedel <jroedel@xxxxxxx>
commit 62c22167dd70b730f61c2b88f950e98154a87980 upstream.
Since commit 1196c2f a domain is only destroyed in the
notifier path if it is hot-unplugged. This caused a
domain leakage in iommu_attach_device when a driver was
unbound from the device and bound to VFIO. In this case the
device is attached to a new domain and unlinked from the old
domain. At this point nothing points to the old domain
anymore and its memory is leaked.
Fix this by explicitly freeing the old domain in
iommu_attach_domain.
Fixes: 1196c2f (iommu/vt-d: Fix dmar_domain leak in iommu_attach_device)
Tested-by: Jerry Hoemann <jerry.hoemann@xxxxxx>
Signed-off-by: Joerg Roedel <jroedel@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/iommu/intel-iommu.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -4265,6 +4265,10 @@ static int intel_iommu_attach_device(str
domain_remove_one_dev_info(old_domain, dev);
else
domain_remove_dev_info(old_domain);
+
+ if (!domain_type_is_vm_or_si(old_domain) &&
+ list_empty(&old_domain->devices))
+ domain_exit(old_domain);
}
}
Patches currently in stable-queue which might be from jroedel@xxxxxxx are
queue-3.18/iommu-vt-d-fix-dmar_domain-leak-in-iommu_attach_device.patch
queue-3.18/iommu-vt-d-fix-an-off-by-one-bug-in-__domain_mapping.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html