]> xenbits.xensource.com Git - people/aperard/xen-arm.git/commitdiff
x86: get_page_from_gfn() must return NULL for invalid GFNs
authorJan Beulich <jbeulich@suse.com>
Tue, 4 Dec 2012 18:38:31 +0000 (18:38 +0000)
committerJan Beulich <jbeulich@suse.com>
Tue, 4 Dec 2012 18:38:31 +0000 (18:38 +0000)
... also in the non-translated case.

This is XSA-32 / CVE-2012-xxxx.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Tim Deegan <tim@xen.org>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
xen/include/asm-x86/p2m.h

index 28be4e864d37f99a0c7b1b8f992f9e92013bb843..907a8173530dacf382ef503289070acb95f53603 100644 (file)
@@ -384,7 +384,7 @@ static inline struct page_info *get_page_from_gfn(
     if (t)
         *t = p2m_ram_rw;
     page = __mfn_to_page(gfn);
-    return get_page(page, d) ? page : NULL;
+    return mfn_valid(gfn) && get_page(page, d) ? page : NULL;
 }