diff options
author | Ian Jackson <ian.jackson@eu.citrix.com> | 2013-06-14 16:45:41 +0100 |
---|---|---|
committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2013-06-14 16:45:41 +0100 |
commit | 6eca85d5c144ee8c899ee3cf8791f9087b15f2e8 (patch) | |
tree | f17d734af34a64aa14bf28dd975306b73ae2b401 | |
parent | a2986a7959919bc748784bb75970bfbd42697d3b (diff) | |
download | xen-6eca85d5c144ee8c899ee3cf8791f9087b15f2e8.tar.gz xen-6eca85d5c144ee8c899ee3cf8791f9087b15f2e8.tar.bz2 xen-6eca85d5c144ee8c899ee3cf8791f9087b15f2e8.zip |
libxc: range checks in xc_dom_p2m_host and _guest
These functions take guest pfns and look them up in the p2m. They did
no range checking.
However, some callers, notably xc_dom_boot.c:setup_hypercall_page want
to pass untrusted guest-supplied value(s). It is most convenient to
detect this here and return INVALID_MFN.
This is part of the fix to a security issue, XSA-55.
Changes from Xen 4.2 version of this patch:
* 4.2 lacks dom->rambase_pfn, so don't add/subtract/check it.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
-rw-r--r-- | tools/libxc/xc_dom.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/libxc/xc_dom.h b/tools/libxc/xc_dom.h index 9dffbe6c1c..316e2ae765 100644 --- a/tools/libxc/xc_dom.h +++ b/tools/libxc/xc_dom.h @@ -315,6 +315,8 @@ static inline xen_pfn_t xc_dom_p2m_host(struct xc_dom_image *dom, xen_pfn_t pfn) { if (dom->shadow_enabled) return pfn; + if (pfn >= dom->total_pages) + return INVALID_MFN; return dom->p2m_host[pfn]; } @@ -323,6 +325,8 @@ static inline xen_pfn_t xc_dom_p2m_guest(struct xc_dom_image *dom, { if (xc_dom_feature_translated(dom)) return pfn; + if (pfn >= dom->total_pages) + return INVALID_MFN; return dom->p2m_host[pfn]; } |