aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Deegan <tim@xen.org>2013-07-01 12:00:27 +0200
committerJan Beulich <jbeulich@suse.com>2013-07-01 12:00:27 +0200
commitda1aa339c82f30ff9dba9d72bc61f52a443c18f5 (patch)
tree2d627d368bf112735cdcbe6230c7b6cf8f0376d9
parent2967614da4953e7af34b3f015df3eb8fd4201f89 (diff)
downloadxen-da1aa339c82f30ff9dba9d72bc61f52a443c18f5.tar.gz
xen-da1aa339c82f30ff9dba9d72bc61f52a443c18f5.tar.bz2
xen-da1aa339c82f30ff9dba9d72bc61f52a443c18f5.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> master commit: a12d15d8c1d512a4ed6498b39f9058f69a1c1f6c master date: 2013-06-21 17:01:50 +0200
-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 130c84b7ed..0740df78bd 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -4379,6 +4379,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(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: