From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Tue, 10 Jun 2014 10:03:16 +0000 (+0200)
Subject: x86/domctl: further fix to XEN_DOMCTL_[gs]etvcpuextstate
X-Git-Tag: 4.5.0-rc1~730
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=895661ae98f0249f50280b4acfb9dda70b76d7e9;p=xen.git

x86/domctl: further fix to XEN_DOMCTL_[gs]etvcpuextstate

Do not clobber errors from certain codepaths.  Clobbering of -EINVAL from
failing "evc->size <= PV_XSAVE_SIZE(_xcr0_accum)" was a pre-existing bug.

However, clobbering -EINVAL/-EFAULT from the get codepath was a bug
unintentionally introduced by 090ca8c1 "x86/domctl: two functional fixes to
XEN_DOMCTL_[gs]etvcpuextstate".

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
index 87af350ab4..d927b597ac 100644
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -1277,8 +1277,6 @@ long arch_do_domctl(
             xfree(receive_buf);
         }
 
-        ret = 0;
-
     vcpuextstate_out:
         if ( domctl->cmd == XEN_DOMCTL_getvcpuextstate )
             copyback = 1;