From b2b39f76e60c48cad4dfaba3a6837255e24da207 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 26 Jan 2012 11:04:59 +0000 Subject: [PATCH] tools/libxc: fix error handling in xc_mem_paging_load xc_mem_paging_load() does not pass errors in errno and the actual errno from xc_mem_event_control() is overwritten by munlock(). xenpaging_populate_page() needs to check errno, but with the switch to xc_mem_paging_load() it could not receive ENOMEM anymore. Update xc_mem_paging_load() to return -1 and preserve errno during munlock(). Signed-off-by: Olaf Hering Acked-by: Andres Lagar-Cavilla Committed-by: Keir Fraser --- tools/libxc/xc_mem_paging.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/libxc/xc_mem_paging.c b/tools/libxc/xc_mem_paging.c index f16d16b3ab..a108a5c4cf 100644 --- a/tools/libxc/xc_mem_paging.c +++ b/tools/libxc/xc_mem_paging.c @@ -68,23 +68,28 @@ int xc_mem_paging_prep(xc_interface *xch, domid_t domain_id, unsigned long gfn) int xc_mem_paging_load(xc_interface *xch, domid_t domain_id, unsigned long gfn, void *buffer) { - int rc; + int rc, old_errno; + + errno = -EINVAL; if ( !buffer ) - return -EINVAL; + return -1; if ( ((unsigned long) buffer) & (XC_PAGE_SIZE - 1) ) - return -EINVAL; + return -1; if ( mlock(buffer, XC_PAGE_SIZE) ) - return -errno; + return -1; rc = xc_mem_event_control(xch, domain_id, XEN_DOMCTL_MEM_EVENT_OP_PAGING_PREP, XEN_DOMCTL_MEM_EVENT_OP_PAGING, buffer, NULL, gfn); - (void)munlock(buffer, XC_PAGE_SIZE); + old_errno = errno; + munlock(buffer, XC_PAGE_SIZE); + errno = old_errno; + return rc; } -- 2.30.2