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>

diff --git a/xen/common/memory.c b/xen/common/memory.c
index fe79ca003e864d7b2569417a2ab7717e8bd1d2c8..6b4ef736470ca63ca06bd209aa356a0af115b00b 100644 (file)
--- 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);