]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
KVM: x86: Do not push eflags.vm on pushf
authorNadav Amit <namit@cs.technion.ac.il>
Wed, 10 Dec 2014 09:19:03 +0000 (11:19 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 10 Dec 2014 11:51:28 +0000 (12:51 +0100)
The pushf instruction does not push eflags.VM, so emulation should not do so as
well.  Although eflags.RF should not be pushed as well, it is already cleared
by the time pushf is executed.

Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/emulate.c

index b4f4201c32c9e400de2fcbbfc261af008ac00a78..c1e71873e0c76057a70a29e0311b4bc8fe95957a 100644 (file)
@@ -1861,7 +1861,7 @@ static int em_pusha(struct x86_emulate_ctxt *ctxt)
 
 static int em_pushf(struct x86_emulate_ctxt *ctxt)
 {
-       ctxt->src.val =  (unsigned long)ctxt->eflags;
+       ctxt->src.val = (unsigned long)ctxt->eflags & ~EFLG_VM;
        return em_push(ctxt);
 }