xen-changelog

[Top] [All Lists]

[Xen-changelog] [xen-unstable] x86/mm/shadow: fix unlocking on error pat

from [Xen patchbot-unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] [xen-unstable] x86/mm/shadow: fix unlocking on error path in p2m allocator
From:	Xen patchbot-unstable <patchbot@xxxxxxx>
Date:	Thu, 10 Feb 2011 06:10:22 -0800
Delivery-date:	Thu, 10 Feb 2011 06:11:29 -0800
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id:	BK change log <xen-changelog.lists.xensource.com>
List-post:	<mailto:xen-changelog@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	xen-devel@xxxxxxxxxxxxxxxxxxx
Sender:	xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxx>
# Date 1297252989 0
# Node ID 1967c7c290ebc6caf29cd3124facc47370c102a3
# Parent  f1fac30a531be95ce147a6acf7a94afb77c8a4a7
x86/mm/shadow: fix unlocking on error path in p2m allocator
One unlock path wasn't gated to match the lock.

Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>
---
 xen/arch/x86/mm/shadow/common.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -r f1fac30a531b -r 1967c7c290eb xen/arch/x86/mm/shadow/common.c
--- a/xen/arch/x86/mm/shadow/common.c   Wed Feb 09 08:58:11 2011 +0000
+++ b/xen/arch/x86/mm/shadow/common.c   Wed Feb 09 12:03:09 2011 +0000
@@ -1634,7 +1634,8 @@ shadow_alloc_p2m_page(struct domain *d)
     if ( d->arch.paging.shadow.total_pages 
          < shadow_min_acceptable_pages(d) + 1 )
     {
-        shadow_unlock(d);
+        if ( do_locking )
+            shadow_unlock(d);
         return NULL;
     }
  

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

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] [xen-unstable] x86/mm/shadow: fix unlocking on error path in p2m allocator, Xen patchbot-unstable <=

Previous by Date:	[Xen-changelog] [xen-unstable] amd iommu: dynamic page table depth adjustment., Xen patchbot-unstable
Next by Date:	[Xen-changelog] [xen-4.0-testing] amd iommu: Fix a xen crash after pci-attach, Xen patchbot-4.0-testing
Previous by Thread:	[Xen-changelog] [xen-unstable] amd iommu: dynamic page table depth adjustment., Xen patchbot-unstable
Next by Thread:	[Xen-changelog] [xen-4.0-testing] amd iommu: Fix a xen crash after pci-attach, Xen patchbot-4.0-testing
Indexes:	[Date] [Thread] [Top] [All Lists]