[Xen-changelog] [xen-unstable] x86: fix assertion in get_page_type()

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1357564826 -3600
# Node ID e1facbde56ff4e5e85f9a4935abc99eb24367cd0
# Parent  8e942f2f3b45edc5bb1f7a6e05de288342426f0d
x86: fix assertion in get_page_type()

c/s 22998:e9fab50d7b61 (and immediately following ones) made it
possible that __get_page_type() returns other than -EINVAL, in
particular -EBUSY. Consequently, the assertion in get_page_type()
should check for only the return values we absolutely don't expect to
see there.

This is XSA-37 / CVE-2013-0154.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
---


diff -r 8e942f2f3b45 -r e1facbde56ff xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Mon Jan 07 13:28:29 2013 +0100
+++ b/xen/arch/x86/mm.c Mon Jan 07 14:20:26 2013 +0100
@@ -2318,7 +2318,7 @@ int get_page_type(struct page_info *page
     int rc = __get_page_type(page, type, 0);
     if ( likely(rc == 0) )
         return 1;
-    ASSERT(rc == -EINVAL);
+    ASSERT(rc != -EINTR && rc != -EAGAIN);
     return 0;
 }
 

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