diff options
| author | Avi Kivity <avi@redhat.com> | 2009-10-04 16:45:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-10-12 12:40:17 -0700 |
| commit | 779632b438a79ab1ed1f0da390712b12db3b2a58 (patch) | |
| tree | 98fee427170529b3b8f96acc56aa436f52b912b1 | |
| parent | 170fa2cc0c90885acdda6b71dd25b5d14960ed5b (diff) | |
| download | linux-stable-779632b438a79ab1ed1f0da390712b12db3b2a58.tar.gz linux-stable-779632b438a79ab1ed1f0da390712b12db3b2a58.tar.bz2 linux-stable-779632b438a79ab1ed1f0da390712b12db3b2a58.zip | |
KVM: Prevent overflow in KVM_GET_SUPPORTED_CPUID
commit 6a54435560efdab1a08f429a954df4d6c740bddf upstream.
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>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | arch/x86/kvm/x86.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 91a077fdc3a4..8aafb62227e8 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1429,6 +1429,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) |