lkml.org 
[lkml]   [2015]   [Feb]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 151/152] KVM: x86 emulator: reject SYSENTER in compatibility mode on AMD guests
    3.2.67-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Avi Kivity <avi@redhat.com>

    commit 1a18a69b762374c423305772500f36eb8984ca52 upstream.

    If the guest thinks it's an AMD, it will not have prepared the SYSENTER MSRs,
    and if the guest executes SYSENTER in compatibility mode, it will fails.

    Detect this condition and #UD instead, like the spec says.

    Signed-off-by: Avi Kivity <avi@redhat.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    arch/x86/kvm/emulate.c | 19 +++++++++++++++++++
    1 file changed, 19 insertions(+)

    --- a/arch/x86/kvm/emulate.c
    +++ b/arch/x86/kvm/emulate.c
    @@ -1952,6 +1952,17 @@ setup_syscalls_segments(struct x86_emula
    ss->p = 1;
    }

    +static bool vendor_intel(struct x86_emulate_ctxt *ctxt)
    +{
    + u32 eax, ebx, ecx, edx;
    +
    + eax = ecx = 0;
    + return ctxt->ops->get_cpuid(ctxt, &eax, &ebx, &ecx, &edx)
    + && ebx == X86EMUL_CPUID_VENDOR_GenuineIntel_ebx
    + && ecx == X86EMUL_CPUID_VENDOR_GenuineIntel_ecx
    + && edx == X86EMUL_CPUID_VENDOR_GenuineIntel_edx;
    +}
    +
    static bool em_syscall_is_enabled(struct x86_emulate_ctxt *ctxt)
    {
    struct x86_emulate_ops *ops = ctxt->ops;
    @@ -2068,6 +2079,14 @@ static int em_sysenter(struct x86_emulat
    if (ctxt->mode == X86EMUL_MODE_REAL)
    return emulate_gp(ctxt, 0);

    + /*
    + * Not recognized on AMD in compat mode (but is recognized in legacy
    + * mode).
    + */
    + if ((ctxt->mode == X86EMUL_MODE_PROT32) && (efer & EFER_LMA)
    + && !vendor_intel(ctxt))
    + return emulate_ud(ctxt);
    +
    /* XXX sysenter/sysexit have not been tested in 64bit mode.
    * Therefore, we inject an #UD.
    */


    \
     
     \ /
      Last update: 2015-02-17 03:01    [W:5.065 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site