From: Tim Deegan <tim@xen.org>
Date: Fri, 21 Jun 2013 15:01:50 +0000 (+0200)
Subject: x86/hvm: fix HVMOP_inject_trap return value on success
X-Git-Tag: 4.3.0-rc6~21
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a12d15d8c1d512a4ed6498b39f9058f69a1c1f6c;p=xen.git

x86/hvm: fix HVMOP_inject_trap return value on success

Reported-by: Antony Saba <Antony.Saba@mandiant.com>
Signed-off-by: Tim Deegan <tim@xen.org>
Acked-by: Keir Fraser <keir@xen.org>
Acked-by: George Dunlap <george.dunlap@eu.citrix.com>
---

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 27484e90ce..43b6d052ba 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -4425,6 +4425,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg)
             v->arch.hvm_vcpu.inject_trap.error_code = tr.error_code;
             v->arch.hvm_vcpu.inject_trap.insn_len = tr.insn_len;
             v->arch.hvm_vcpu.inject_trap.cr2 = tr.cr2;
+            rc = 0;
         }
 
     param_fail8: