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

["Xen patchbot-4.0-testing" <patchbot-4.0-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1292514051 0
# Node ID a453885067908f8a092b5d7f7d9ad07c8db3be9c
# Parent  66a6203d27fdd02c1b619343e25e4a3d379aaac9
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-unstable changeset:   22549:aa18b8ddaf05
xen-unstable date:        Thu Dec 16 15:38:57 2010 +0000
---
 xen/drivers/passthrough/vtd/iommu.c |    2 ++
 1 files changed, 2 insertions(+)

diff -r 66a6203d27fd -r a45388506790 xen/drivers/passthrough/vtd/iommu.c
--- a/xen/drivers/passthrough/vtd/iommu.c       Wed Dec 15 12:14:05 2010 +0000
+++ b/xen/drivers/passthrough/vtd/iommu.c       Thu Dec 16 15:40:51 2010 +0000
@@ -1300,6 +1300,7 @@ static 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;
     }
 
@@ -1631,6 +1632,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