You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
57 lines
2.0 KiB
57 lines
2.0 KiB
11 years ago
|
From a672da4b2d58ef12be9d7407160e9fb43cac75d9 Mon Sep 17 00:00:00 2001
|
||
|
From: Ian Jackson <ian.jackson@eu.citrix.com>
|
||
|
Date: Fri, 14 Jun 2013 16:43:16 +0100
|
||
|
Subject: [PATCH 02/23] libxc: introduce xc_dom_seg_to_ptr_pages
|
||
|
|
||
|
Provide a version of xc_dom_seg_to_ptr which returns the number of
|
||
|
guest pages it has actually mapped. This is useful for callers who
|
||
|
want to do range checking; we will use this later in this series.
|
||
|
|
||
|
This is part of the fix to a security issue, XSA-55.
|
||
|
|
||
|
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
|
||
|
Acked-by: Ian Campbell <ian.campbell@citrix.com>
|
||
|
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
||
|
---
|
||
|
tools/libxc/xc_dom.h | 19 ++++++++++++++++---
|
||
|
1 files changed, 16 insertions(+), 3 deletions(-)
|
||
|
|
||
|
diff --git a/tools/libxc/xc_dom.h b/tools/libxc/xc_dom.h
|
||
|
index 6a72aa9..9af2195 100644
|
||
|
--- a/tools/libxc/xc_dom.h
|
||
|
+++ b/tools/libxc/xc_dom.h
|
||
|
@@ -278,14 +278,27 @@ void *xc_dom_pfn_to_ptr(struct xc_dom_image *dom, xen_pfn_t first,
|
||
|
void xc_dom_unmap_one(struct xc_dom_image *dom, xen_pfn_t pfn);
|
||
|
void xc_dom_unmap_all(struct xc_dom_image *dom);
|
||
|
|
||
|
-static inline void *xc_dom_seg_to_ptr(struct xc_dom_image *dom,
|
||
|
- struct xc_dom_seg *seg)
|
||
|
+static inline void *xc_dom_seg_to_ptr_pages(struct xc_dom_image *dom,
|
||
|
+ struct xc_dom_seg *seg,
|
||
|
+ xen_pfn_t *pages_out)
|
||
|
{
|
||
|
xen_vaddr_t segsize = seg->vend - seg->vstart;
|
||
|
unsigned int page_size = XC_DOM_PAGE_SIZE(dom);
|
||
|
xen_pfn_t pages = (segsize + page_size - 1) / page_size;
|
||
|
+ void *retval;
|
||
|
+
|
||
|
+ retval = xc_dom_pfn_to_ptr(dom, seg->pfn, pages);
|
||
|
+
|
||
|
+ *pages_out = retval ? pages : 0;
|
||
|
+ return retval;
|
||
|
+}
|
||
|
+
|
||
|
+static inline void *xc_dom_seg_to_ptr(struct xc_dom_image *dom,
|
||
|
+ struct xc_dom_seg *seg)
|
||
|
+{
|
||
|
+ xen_pfn_t dummy;
|
||
|
|
||
|
- return xc_dom_pfn_to_ptr(dom, seg->pfn, pages);
|
||
|
+ return xc_dom_seg_to_ptr_pages(dom, seg, &dummy);
|
||
|
}
|
||
|
|
||
|
static inline void *xc_dom_vaddr_to_ptr(struct xc_dom_image *dom,
|
||
|
--
|
||
|
1.7.2.5
|
||
|
|