summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/x86.c
diff options
context:
space:
mode:
authorGleb Natapov2013-01-21 14:36:48 +0100
committerMarcelo Tosatti2013-01-24 03:40:31 +0100
commit378a8b099fc207ddcb91b19a8c1457667e0af398 (patch)
tree765795d3fb0e37b87ba5b37d119b2731809ec64b /arch/x86/kvm/x86.c
parentKVM: VMX: rename fix_pmode_dataseg to fix_pmode_seg. (diff)
downloadkernel-qcow2-linux-378a8b099fc207ddcb91b19a8c1457667e0af398.tar.gz
kernel-qcow2-linux-378a8b099fc207ddcb91b19a8c1457667e0af398.tar.xz
kernel-qcow2-linux-378a8b099fc207ddcb91b19a8c1457667e0af398.zip
KVM: x86: fix use of uninitialized memory as segment descriptor in emulator.
If VMX reports segment as unusable, zero descriptor passed by the emulator before returning. Such descriptor will be considered not present by the emulator. Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r--arch/x86/kvm/x86.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index e00dd0515a84..b9f55299ed7e 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -4489,8 +4489,10 @@ static bool emulator_get_segment(struct x86_emulate_ctxt *ctxt, u16 *selector,
kvm_get_segment(emul_to_vcpu(ctxt), &var, seg);
*selector = var.selector;
- if (var.unusable)
+ if (var.unusable) {
+ memset(desc, 0, sizeof(*desc));
return false;
+ }
if (var.g)
var.limit >>= 12;