lkml.org 
[lkml]   [2014]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 041/105] kvm: don't take vcpu mutex for obviously invalid vcpu ioctls
    Date
    3.13.11.10 -stable review patch.  If anyone has any objections, please let me know.

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

    From: David Matlack <dmatlack@google.com>

    commit 2ea75be3219571d0ec009ce20d9971e54af96e09 upstream.

    vcpu ioctls can hang the calling thread if issued while a vcpu is running.
    However, invalid ioctls can happen when userspace tries to probe the kind
    of file descriptors (e.g. isatty() calls ioctl(TCGETS)); in that case,
    we know the ioctl is going to be rejected as invalid anyway and we can
    fail before trying to take the vcpu mutex.

    This patch does not change functionality, it just makes invalid ioctls
    fail faster.

    Signed-off-by: David Matlack <dmatlack@google.com>
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    virt/kvm/kvm_main.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
    index 44652f2..8d2a98a 100644
    --- a/virt/kvm/kvm_main.c
    +++ b/virt/kvm/kvm_main.c
    @@ -52,6 +52,7 @@

    #include <asm/processor.h>
    #include <asm/io.h>
    +#include <asm/ioctl.h>
    #include <asm/uaccess.h>
    #include <asm/pgtable.h>

    @@ -1994,6 +1995,9 @@ static long kvm_vcpu_ioctl(struct file *filp,
    if (vcpu->kvm->mm != current->mm)
    return -EIO;

    + if (unlikely(_IOC_TYPE(ioctl) != KVMIO))
    + return -EINVAL;
    +
    #if defined(CONFIG_S390) || defined(CONFIG_PPC) || defined(CONFIG_MIPS)
    /*
    * Special cases: vcpu ioctls that are asynchronous to vcpu execution,
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-10-27 20:41    [W:3.162 / U:0.612 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site