[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Xen-devel] [PATCH] x86/mm: Fix locking on hap enable failure
- To: xen-devel@xxxxxxxxxxxxx
- From: Andres Lagar-Cavilla <andres@xxxxxxxxxxxxxxxx>
- Date: Fri, 13 Apr 2012 17:18:06 -0400
- Cc: andres@xxxxxxxxxxxxxx, tim@xxxxxxx
- Delivery-date: Fri, 13 Apr 2012 21:13:41 +0000
- Dkim-signature: v=1; a=rsa-sha1; c=relaxed; d=lagarcavilla.org; h= content-type:mime-version:content-transfer-encoding:subject :message-id:date:from:to:cc; s=lagarcavilla.org; bh=E3F9UTr5wc7e Mg6UHWNq/Djm8C4=; b=nBIQlTQP51FJ4Tln1GlON1gxcBOjG4IEz8KrYYwb3D7f b7oxXkEuqD4X3PlOZ/lcqhRUUOHIGoXcFteaOMus0Twj8o342E2wkDKaIhjfAiX7 n1aiVmH+uAum7E12abb1O1LJ9OBwnadeQfBnuw8/++eacU790OLfGbqctodFCXg=
- Domainkey-signature: a=rsa-sha1; c=nofws; d=lagarcavilla.org; h=content-type :mime-version:content-transfer-encoding:subject:message-id:date :from:to:cc; q=dns; s=lagarcavilla.org; b=mJ93mKUKQMr+f5UjkI2P7g 5Tj1spQpFWCiMKitoYvac7T9et8DRN6KhwsniEWBzQEIKf/21ELWCH2S2GDnb5vL 872Iyhs1np6oAnsr4RYtCIPKuIaezV4Pyb1IuJkBPGrT/y1ejCs+cfjLUFDUcYd3 HxG1MZN2xD7v1TXU0PHzg=
- List-id: Xen developer discussion <xen-devel.lists.xen.org>
xen/arch/x86/mm/hap/hap.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
If enabling hap fails due to out of memory, the locking on the clean up path is
broken.
Signed-off-by: Andres Lagar-Cavilla <andres@xxxxxxxxxxxxxxxx>
diff -r 8ec52231c03d -r 15a3c740419f xen/arch/x86/mm/hap/hap.c
--- a/xen/arch/x86/mm/hap/hap.c
+++ b/xen/arch/x86/mm/hap/hap.c
@@ -585,13 +585,14 @@ int hap_enable(struct domain *d, u32 mod
unsigned int r;
paging_lock(d);
r = hap_set_allocation(d, 256, NULL);
- paging_unlock(d);
if ( r != 0 )
{
hap_set_allocation(d, 0, NULL);
+ paging_unlock(d);
rv = -ENOMEM;
goto out;
}
+ paging_unlock(d);
}
/* Allow p2m and log-dirty code to borrow our memory */
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel