summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-11-24 15:20:15 +0200
committerAvi Kivity <avi@redhat.com>2009-12-03 09:32:25 +0200
commiteb3c79e64a70fb8f7473e30fa07e89c1ecc2c9bb (patch)
treee6c73345d26a553d0b36a9503d674fd70b66233d /arch/x86/include
parentd7b0b5eb3000c6fb902f08c619fcd673a23d8fab (diff)
downloadblackbird-obmc-linux-eb3c79e64a70fb8f7473e30fa07e89c1ecc2c9bb.tar.gz
blackbird-obmc-linux-eb3c79e64a70fb8f7473e30fa07e89c1ecc2c9bb.zip
KVM: x86 emulator: limit instructions to 15 bytes
While we are never normally passed an instruction that exceeds 15 bytes, smp games can cause us to attempt to interpret one, which will cause large latencies in non-preempt hosts. Cc: stable@kernel.org Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/kvm_emulate.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
index b7ed2c423116..7c18e1230f54 100644
--- a/arch/x86/include/asm/kvm_emulate.h
+++ b/arch/x86/include/asm/kvm_emulate.h
@@ -129,7 +129,7 @@ struct decode_cache {
u8 seg_override;
unsigned int d;
unsigned long regs[NR_VCPU_REGS];
- unsigned long eip;
+ unsigned long eip, eip_orig;
/* modrm */
u8 modrm;
u8 modrm_mod;
OpenPOWER on IntegriCloud