diff options
author | Andy Honig <ahonig@google.com> | 2013-11-18 19:09:22 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-20 10:45:07 -0500 |
commit | f4d838225e0cbdc8099c2eb8d55dd9406def1f33 (patch) | |
tree | ce82eab11ef8913393eeb58b66e528d2480e78cb | |
parent | a5633d4871bae973f39945b2ba0f86f6bbd45ab4 (diff) |
KVM: Improve create VCPU parameter (CVE-2013-4587)
commit 338c7dbadd2671189cec7faf64c84d01071b3f96 upstream.
In multiple functions the vcpu_id is used as an offset into a bitfield. Ag
malicious user could specify a vcpu_id greater than 255 in order to set or
clear bits in kernel memory. This could be used to elevate priveges in the
kernel. This patch verifies that the vcpu_id provided is less than 255.
The api documentation already specifies that the vcpu_id must be less than
max_vcpus, but this is currently not checked.
Reported-by: Andrew Honig <ahonig@google.com>
Signed-off-by: Andrew Honig <ahonig@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | virt/kvm/kvm_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 302681c4aa44..eb99458f5b68 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
@@ -1904,6 +1904,9 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) | |||
1904 | int r; | 1904 | int r; |
1905 | struct kvm_vcpu *vcpu, *v; | 1905 | struct kvm_vcpu *vcpu, *v; |
1906 | 1906 | ||
1907 | if (id >= KVM_MAX_VCPUS) | ||
1908 | return -EINVAL; | ||
1909 | |||
1907 | vcpu = kvm_arch_vcpu_create(kvm, id); | 1910 | vcpu = kvm_arch_vcpu_create(kvm, id); |
1908 | if (IS_ERR(vcpu)) | 1911 | if (IS_ERR(vcpu)) |
1909 | return PTR_ERR(vcpu); | 1912 | return PTR_ERR(vcpu); |