diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-31 09:44:52 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-31 09:44:52 +0000 |
| commit | 5bca889af9ee712d0dac3b61b1cec79e7c99ec58 (patch) | |
| tree | f2cefd580d49799f5baac0593e6b70c1503410b2 /virt | |
| parent | b7cd0dbce754d20e841b0c27c177ea91e96481f3 (diff) | |
| parent | cd2c5381cba9b0c40519b25841315621738688a0 (diff) | |
Merge tag 'v3.14.23' into linux-linaro-lsk-v3.14
This is the 3.14.23 stable release
Conflicts:
arch/s390/kvm/interrupt.c
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/kvm_main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 4bdadf1a6754..a0f02bc7b264 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> @@ -1997,6 +1998,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, |