[PATCH 3.2 028/164] kvm: don't take vcpu mutex for obviously invalid vcpu ioctls
From: Ben Hutchings
Date: Fri Dec 12 2014 - 01:53:46 EST
3.2.65-rc1 review patch. If anyone has any objections, please let me know.
From: David Matlack <dmatlack@xxxxxxxxxx>
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
Signed-off-by: David Matlack <dmatlack@xxxxxxxxxx>
Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
virt/kvm/kvm_main.c | 4 ++++
1 file changed, 4 insertions(+)
@@ -52,6 +52,7 @@
@@ -1766,6 +1767,9 @@ static long kvm_vcpu_ioctl(struct file *
if (vcpu->kvm->mm != current->mm)
+ if (unlikely(_IOC_TYPE(ioctl) != KVMIO))
+ return -EINVAL;
#if defined(CONFIG_S390) || defined(CONFIG_PPC)
* Special cases: vcpu ioctls that are asynchronous to vcpu execution,
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/