libxc: Propagate errno from hypercall instead of anything else.

After we have done the hypercall - the errno has the failure
code. However our usage of pthread and munmap can trigger them
to manipulate the errno with their failure values. That would
be bad as what we care about is just the hypercall error value.

Another solution to this would be to save the 'errno' from
pthread/munmap/madvise as an extra parameter to be analyzed
later. However the call-sites above us do not care about it.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
This commit is contained in:
Konrad Rzeszutek Wilk authored and Ian Campbell committed 2015-03-20 16:04:35 +00:00
1 parent ce156118ae
commit e12c6e8d18
3 files changed
+12

No files matched your search

+3
View File
@@ -125,10 +125,13 @@ static void freebsd_privcmd_free_hypercall_buffer(xc_interface *xch,
int npages)
{
int saved_errno = errno;
/* Unlock pages */
munlock(ptr, npages * XC_PAGE_SIZE);
munmap(ptr, npages * XC_PAGE_SIZE);
/* We MUST propagate the hypercall errno, not unmap call's. */
errno = saved_errno;
}
static int freebsd_privcmd_hypercall(xc_interface *xch, xc_osdep_handle h,
+6
View File
@@ -33,16 +33,22 @@ pthread_mutex_t hypercall_buffer_cache_mutex = PTHREAD_MUTEX_INITIALIZER;
static void hypercall_buffer_cache_lock(xc_interface *xch)
{
int saved_errno = errno;
if ( xch->flags & XC_OPENFLAG_NON_REENTRANT )
return;
pthread_mutex_lock(&hypercall_buffer_cache_mutex);
/* Ignore pthread errors. */
errno = saved_errno;
}
static void hypercall_buffer_cache_unlock(xc_interface *xch)
{
int saved_errno = errno;
if ( xch->flags & XC_OPENFLAG_NON_REENTRANT )
return;
pthread_mutex_unlock(&hypercall_buffer_cache_mutex);
/* Ignore pthread errors. */
errno = saved_errno;
}
static void *hypercall_buffer_cache_alloc(xc_interface *xch, int nr_pages)
+3
View File
@@ -122,10 +122,13 @@ out:
static void linux_privcmd_free_hypercall_buffer(xc_interface *xch, xc_osdep_handle h, void *ptr, int npages)
{
int saved_errno = errno;
/* Recover the VMA flags. Maybe it's not necessary */
madvise(ptr, npages * XC_PAGE_SIZE, MADV_DOFORK);
munmap(ptr, npages * XC_PAGE_SIZE);
/* We MUST propagate the hypercall errno, not unmap call's. */
errno = saved_errno;
}
static int linux_privcmd_hypercall(xc_interface *xch, xc_osdep_handle h, privcmd_hypercall_t *hypercall)
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.