All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, "Dmitry Vyukov" <dvyukov@google.com>,
	"David Hildenbrand" <david@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Radim Krčmář" <rkrcmar@redhat.com>,
	"Nadav Amit" <nadav.amit@gmail.com>,
	"Wanpeng Li" <wanpeng.li@hotmail.com>,
	"Sasha Levin" <alexander.levin@microsoft.com>
Subject: [PATCH 3.18 14/36] KVM: VMX: Fix rflags cache during vCPU reset
Date: Mon,  5 Feb 2018 10:23:42 -0800	[thread overview]
Message-ID: <20180205182352.360835097@linuxfoundation.org> (raw)
In-Reply-To: <20180205182351.774761393@linuxfoundation.org>

3.18-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Wanpeng Li <wanpeng.li@hotmail.com>


[ Upstream commit c37c28730bb031cc8a44a130c2555c0f3efbe2d0 ]

Reported by syzkaller:

   *** Guest State ***
   CR0: actual=0x0000000080010031, shadow=0x0000000060000010, gh_mask=fffffffffffffff7
   CR4: actual=0x0000000000002061, shadow=0x0000000000000000, gh_mask=ffffffffffffe8f1
   CR3 = 0x000000002081e000
   RSP = 0x000000000000fffa  RIP = 0x0000000000000000
   RFLAGS=0x00023000         DR7 = 0x00000000000000
          ^^^^^^^^^^
   ------------[ cut here ]------------
   WARNING: CPU: 6 PID: 24431 at /home/kernel/linux/arch/x86/kvm//x86.c:7302 kvm_arch_vcpu_ioctl_run+0x651/0x2ea0 [kvm]
   CPU: 6 PID: 24431 Comm: reprotest Tainted: G        W  OE   4.14.0+ #26
   RIP: 0010:kvm_arch_vcpu_ioctl_run+0x651/0x2ea0 [kvm]
   RSP: 0018:ffff880291d179e0 EFLAGS: 00010202
   Call Trace:
    kvm_vcpu_ioctl+0x479/0x880 [kvm]
    do_vfs_ioctl+0x142/0x9a0
    SyS_ioctl+0x74/0x80
    entry_SYSCALL_64_fastpath+0x23/0x9a

The failed vmentry is triggered by the following beautified testcase:

    #include <unistd.h>
    #include <sys/syscall.h>
    #include <string.h>
    #include <stdint.h>
    #include <linux/kvm.h>
    #include <fcntl.h>
    #include <sys/ioctl.h>

    long r[5];
    int main()
    {
        struct kvm_debugregs dr = { 0 };

        r[2] = open("/dev/kvm", O_RDONLY);
        r[3] = ioctl(r[2], KVM_CREATE_VM, 0);
        r[4] = ioctl(r[3], KVM_CREATE_VCPU, 7);
        struct kvm_guest_debug debug = {
                .control = 0xf0403,
                .arch = {
                        .debugreg[6] = 0x2,
                        .debugreg[7] = 0x2
                }
        };
        ioctl(r[4], KVM_SET_GUEST_DEBUG, &debug);
        ioctl(r[4], KVM_RUN, 0);
    }

which testcase tries to setup the processor specific debug
registers and configure vCPU for handling guest debug events through
KVM_SET_GUEST_DEBUG.  The KVM_SET_GUEST_DEBUG ioctl will get and set
rflags in order to set TF bit if single step is needed. All regs' caches
are reset to avail and GUEST_RFLAGS vmcs field is reset to 0x2 during vCPU
reset. However, the cache of rflags is not reset during vCPU reset. The
function vmx_get_rflags() returns an unreset rflags cache value since
the cache is marked avail, it is 0 after boot. Vmentry fails if the
rflags reserved bit 1 is 0.

This patch fixes it by resetting both the GUEST_RFLAGS vmcs field and
its cache to 0x2 during vCPU reset.

Reported-by: Dmitry Vyukov <dvyukov@google.com>
Tested-by: Dmitry Vyukov <dvyukov@google.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: Nadav Amit <nadav.amit@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 arch/x86/kvm/vmx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -4569,7 +4569,7 @@ static void vmx_vcpu_reset(struct kvm_vc
 	vmcs_writel(GUEST_SYSENTER_ESP, 0);
 	vmcs_writel(GUEST_SYSENTER_EIP, 0);
 
-	vmcs_writel(GUEST_RFLAGS, 0x02);
+	kvm_set_rflags(vcpu, X86_EFLAGS_FIXED);
 	kvm_rip_write(vcpu, 0xfff0);
 
 	vmcs_writel(GUEST_GDTR_BASE, 0);

  parent reply	other threads:[~2018-02-05 18:23 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-05 18:23 [PATCH 3.18 00/36] 3.18.94-stable review Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 01/36] Input: do not emit unneeded EV_SYN when suspending Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 02/36] um: link vmlinux with -no-pie Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 03/36] um: Stop abusing __KERNEL__ Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 04/36] um: Remove copy&paste code from init.h Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 05/36] loop: fix concurrent lo_open/lo_release Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 06/36] ALSA: seq: Make ioctls race-free Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 07/36] gpio: iop: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 08/36] igb: Free IRQs when device is hotplugged Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 09/36] KVM: x86: emulator: Return to user-mode on L1 CPL=0 emulation failure Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 10/36] KVM: x86: Dont re-execute instruction when not passing CR2 value Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 11/36] KVM: X86: Fix operand/address-size during instruction decoding Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 12/36] bcache: check return value of register_shrinker Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 13/36] mac80211: fix the update of path metric for RANN frame Greg Kroah-Hartman
2018-02-05 18:23 ` Greg Kroah-Hartman [this message]
2018-02-05 18:23 ` [PATCH 3.18 15/36] xen-netfront: remove warning when unloading module Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 16/36] nfsd: CLOSE SHOULD return the invalid special stateid for NFSv4.x (x>0) Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 17/36] nfsd: check for use of the closed special stateid Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 18/36] hwmon: (pmbus) Use 64bit math for DIRECT format values Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 19/36] net: ethernet: xilinx: Mark XILINX_LL_TEMAC broken on 64-bit Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 20/36] quota: Check for register_shrinker() failure Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 21/36] scsi: ufs: ufshcd: fix potential NULL pointer dereference in ufshcd_config_vreg Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 22/36] media: usbtv: add a new usbid Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 23/36] usb: gadget: dont dereference g until after it has been null checked Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 24/36] staging: rtl8188eu: Fix incorrect response to SIOCGIWESSID Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 25/36] USB: serial: pl2303: new device id for Chilitag Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 26/36] USB: cdc-acm: Do not log urb submission errors on disconnect Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 27/36] CDC-ACM: apply quirk for card reader Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 28/36] USB: serial: io_edgeport: fix possible sleep-in-atomic Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 29/36] usbip: prevent bind loops on devices attached to vhci_hcd Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 30/36] usbip: list: dont list " Greg Kroah-Hartman
2018-02-05 18:23 ` [PATCH 3.18 31/36] USB: serial: simple: add Motorola Tetra driver Greg Kroah-Hartman
2018-02-05 18:24 ` [PATCH 3.18 32/36] usb: f_fs: Prevent gadget unbind if it is already unbound Greg Kroah-Hartman
2018-02-05 18:24 ` [PATCH 3.18 33/36] usb: uas: unconditionally bring back host after reset Greg Kroah-Hartman
2018-02-05 18:24 ` [PATCH 3.18 34/36] selinux: general protection fault in sock_has_perm Greg Kroah-Hartman
2018-02-05 18:24   ` Greg Kroah-Hartman
2018-02-05 18:24 ` [PATCH 3.18 35/36] spi: imx: do not access registers while clocks disabled Greg Kroah-Hartman
2018-02-05 18:24 ` [PATCH 3.18 36/36] ASoC: pcm512x: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE Greg Kroah-Hartman
2018-02-05 21:35 ` [PATCH 3.18 00/36] 3.18.94-stable review Guenter Roeck
2018-02-06 10:27   ` Greg Kroah-Hartman
2018-02-05 22:15 ` Shuah Khan
2018-02-05 22:16 ` kernelci.org bot
2018-02-06  6:48 ` Harsh Shandilya
2018-02-06 10:34   ` Greg Kroah-Hartman
2018-02-06 11:42     ` Harsh Shandilya
2018-02-06 13:14       ` Greg Kroah-Hartman
2018-02-06 14:48         ` Guenter Roeck
2018-02-07 14:37           ` Greg Kroah-Hartman
2018-02-07 16:55             ` Guenter Roeck
2018-02-06 14:29 ` Guenter Roeck
2018-02-06 17:00   ` Greg Kroah-Hartman
2018-02-07 15:19 ` Harsh Shandilya
2018-02-07 23:17   ` Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180205182352.360835097@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=alexander.levin@microsoft.com \
    --cc=david@redhat.com \
    --cc=dvyukov@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nadav.amit@gmail.com \
    --cc=pbonzini@redhat.com \
    --cc=rkrcmar@redhat.com \
    --cc=stable@vger.kernel.org \
    --cc=wanpeng.li@hotmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.