aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2012-12-04 18:02:59 +0000
committerJan Beulich <jbeulich@suse.com>2012-12-04 18:02:59 +0000
commitf2ccf981beaa48bab1dba7e1642e08444e991d94 (patch)
tree0aa79945764c3aefde8776e24e5c8f426b75de00
parentb1fab50952b1673560bdfe42d3cb2f81e18db1db (diff)
downloadxen-f2ccf981beaa48bab1dba7e1642e08444e991d94.tar.gz
xen-f2ccf981beaa48bab1dba7e1642e08444e991d94.tar.bz2
xen-f2ccf981beaa48bab1dba7e1642e08444e991d94.zip
x86: get_page_from_gfn() must return NULL for invalid GFNs
... 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>
-rw-r--r--xen/include/asm-x86/p2m.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h
index 7a7c7eb12b..d5665b87fb 100644
--- a/xen/include/asm-x86/p2m.h
+++ b/xen/include/asm-x86/p2m.h
@@ -400,7 +400,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;
}