aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Deegan <tim@xen.org>2013-06-21 17:01:50 +0200
committerJan Beulich <jbeulich@suse.com>2013-06-21 17:01:50 +0200
commita12d15d8c1d512a4ed6498b39f9058f69a1c1f6c (patch)
tree0d2cdc6566caca15c2fe0fd18c0d81e0234f37af
parentaf501e3af46ea9d65ad114084bb7b55b4ae6846e (diff)
downloadxen-a12d15d8c1d512a4ed6498b39f9058f69a1c1f6c.tar.gz
xen-a12d15d8c1d512a4ed6498b39f9058f69a1c1f6c.tar.bz2
xen-a12d15d8c1d512a4ed6498b39f9058f69a1c1f6c.zip
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>
-rw-r--r--xen/arch/x86/hvm/hvm.c1
1 files changed, 1 insertions, 0 deletions
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: