linux-kernel - Re: [PATCH v11 7/7] KVM: x86: virtualize cpuid faulting

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1514461290.13216247.1479328935760.JavaMail.zimbra@redhat.com>
Date:   Wed, 16 Nov 2016 15:42:15 -0500 (EST)
From:   Paolo Bonzini <pbonzini@...hat.com>
To:     Kyle Huey <me@...ehuey.com>
Cc:     Nadav Amit <nadav.amit@...il.com>,
        "Robert O'Callahan" <robert@...llahan.org>,
        Thomas Gleixner <tglx@...utronix.de>,
        Andy Lutomirski <luto@...nel.org>,
        Ingo Molnar <mingo@...hat.com>,
        "H. Peter Anvin" <hpa@...or.com>, X86 ML <x86@...nel.org>,
        Radim Krčmář <rkrcmar@...hat.com>,
        Jeff Dike <jdike@...toit.com>,
        Richard Weinberger <richard@....at>,
        Alexander Viro <viro@...iv.linux.org.uk>,
        Shuah Khan <shuah@...nel.org>,
        Dave Hansen <dave.hansen@...ux.intel.com>,
        Borislav Petkov <bp@...e.de>,
        Peter Zijlstra <peterz@...radead.org>,
        Boris Ostrovsky <boris.ostrovsky@...cle.com>,
        Len Brown <len.brown@...el.com>,
        "Rafael J. Wysocki" <rafael.j.wysocki@...el.com>,
        Dmitry Safonov <dsafonov@...tuozzo.com>,
        David Matlack <dmatlack@...gle.com>,
        LKML <linux-kernel@...r.kernel.org>,
        "open list:USER-MODE LINUX (UML)" 
        <user-mode-linux-devel@...ts.sourceforge.net>,
        "open list:USER-MODE LINUX (UML)" 
        <user-mode-linux-user@...ts.sourceforge.net>,
        "open list:FILESYSTEMS (VFS and infrastructure)" 
        <linux-fsdevel@...r.kernel.org>,
        "open list:KERNEL SELFTEST FRAMEWORK" 
        <linux-kselftest@...r.kernel.org>, KVM <kvm@...r.kernel.org>
Subject: Re: [PATCH v11 7/7] KVM: x86: virtualize cpuid faulting

> On Fri, Nov 11, 2016 at 12:54 PM, Nadav Amit <nadav.amit@...il.com> wrote:
> >
> >> On Nov 10, 2016, at 3:40 PM, Kyle Huey <me@...ehuey.com> wrote:
> >>
> >> Hardware support for faulting on the cpuid instruction is not required to
> >> emulate it, because cpuid triggers a VM exit anyways. KVM handles the
> >> relevant
> >> MSRs (MSR_PLATFORM_INFO and MSR_MISC_FEATURES_ENABLE) and upon a
> >> cpuid-induced VM exit checks the cpuid faulting state and the CPL.
> >> kvm_require_cpl is even kind enough to inject the GP fault for us.
> >
> > I think that for consistency you should also revise em_cpuid() of KVM
> > instruction emulator. Otherwise it may be a potential security
> > hazard (as far fetched as it currently seems).
> 
> Hmm, ok.  Do you know how I can test this code path?

Try this patch (untested!)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 5382b82462fc..06d940a7c9fa 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -5868,8 +5868,7 @@ static void vmx_set_dr7(struct kvm_vcpu *vcpu, unsigned long val)
 
 static int handle_cpuid(struct kvm_vcpu *vcpu)
 {
-	kvm_emulate_cpuid(vcpu);
-	return 1;
+	return emulate_instruction(vcpu, 0) == EMULATE_DONE;
 }
 
 static int handle_rdmsr(struct kvm_vcpu *vcpu)

Paolo