aboutsummaryrefslogtreecommitdiffstats
path: root/xen/common/memory.c
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2013-01-15 16:11:04 +0100
committerJan Beulich <jbeulich@suse.com>2013-01-15 16:11:04 +0100
commit77d3a1db3196b1b5864469f8d3f41d496800c795 (patch)
treea556b9d07b29b0446050c3b43b8fd50ce8380881 /xen/common/memory.c
parentaa1b9dfdff9cb97c96d5b976457253ab92745bd1 (diff)
downloadxen-77d3a1db3196b1b5864469f8d3f41d496800c795.tar.gz
xen-77d3a1db3196b1b5864469f8d3f41d496800c795.tar.bz2
xen-77d3a1db3196b1b5864469f8d3f41d496800c795.zip
fix XENMEM_remove_from_physmap return value
A random value is being returned as of c/s 26350:ba386fd2bf17 in the success case. Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Diffstat (limited to 'xen/common/memory.c')
-rw-r--r--xen/common/memory.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/xen/common/memory.c b/xen/common/memory.c
index fe79ca003e..6b4ef73647 100644
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -687,10 +687,11 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
if ( d == NULL )
return -ESRCH;
- if ( xsm_remove_from_physmap(XSM_TARGET, current->domain, d) )
+ rc = xsm_remove_from_physmap(XSM_TARGET, current->domain, d);
+ if ( rc )
{
rcu_unlock_domain(d);
- return -EPERM;
+ return rc;
}
domain_lock(d);