[Xen-changelog] [xen-unstable] vtd: Require unmap_vtd_domain_page() on a couple of early exit paths.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1292513937 0
# Node ID aa18b8ddaf05084aef3f8cff11d92248a8b6fac8
# Parent  f46f46bbb69a788037f866025c88743d55dde416
vtd: Require unmap_vtd_domain_page() on a couple of early exit paths.

From: Jan Beulich <JBeulich@xxxxxxxxxx>
Signed-off-by: Keir Fraser <keir@xxxxxxx>
---
 xen/drivers/passthrough/vtd/iommu.c |    2 ++
 1 files changed, 2 insertions(+)

diff -r f46f46bbb69a -r aa18b8ddaf05 xen/drivers/passthrough/vtd/iommu.c
--- a/xen/drivers/passthrough/vtd/iommu.c       Wed Dec 15 16:49:25 2010 +0000
+++ b/xen/drivers/passthrough/vtd/iommu.c       Thu Dec 16 15:38:57 2010 +0000
@@ -1336,6 +1336,7 @@ int domain_context_mapping_one(
     if ( context_set_domain_id(context, domain, iommu) )
     {
         spin_unlock(&iommu->lock);
+        unmap_vtd_domain_page(context_entries);
         return -EFAULT;
     }
 
@@ -1684,6 +1685,7 @@ static int intel_iommu_map_page(
     if ( old.val == new.val )
     {
         spin_unlock(&hd->mapping_lock);
+        unmap_vtd_domain_page(page);
         return 0;
     }
     *pte = new;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog