]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
KVM: Prevent overflow in KVM_GET_SUPPORTED_CPUID
authorAvi Kivity <avi@redhat.com>
Sun, 4 Oct 2009 14:45:13 +0000 (16:45 +0200)
committerAvi Kivity <avi@redhat.com>
Sun, 4 Oct 2009 15:04:16 +0000 (17:04 +0200)
The number of entries is multiplied by the entry size, which can
overflow on 32-bit hosts.  Bound the entry count instead.

Reported-by: David Wagner <daw@cs.berkeley.edu>
Cc: stable@kernel.org
Signed-off-by: Avi Kivity <avi@redhat.com>
arch/x86/kvm/x86.c

index be451ee44249be80cdc4829df1f8a6ccc1f5d2f5..9b9695322f567875169c4d934e4100cb266e5d52 100644 (file)
@@ -1591,6 +1591,8 @@ static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
 
        if (cpuid->nent < 1)
                goto out;
+       if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
+               cpuid->nent = KVM_MAX_CPUID_ENTRIES;
        r = -ENOMEM;
        cpuid_entries = vmalloc(sizeof(struct kvm_cpuid_entry2) * cpuid->nent);
        if (!cpuid_entries)