diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2009-05-12 12:36:44 +0100 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-09-10 08:32:39 +0300 |
| commit | cb007648de83cf226d69ec76e1c01848b4e8e49f (patch) | |
| tree | ddbffb8ad08a1805200ca61ba22b98ec086d0901 /arch | |
| parent | 60af2ecdc53af5b941e4a2eb99862a7ccf3ed7c8 (diff) | |
| download | op-kernel-dev-cb007648de83cf226d69ec76e1c01848b4e8e49f.zip op-kernel-dev-cb007648de83cf226d69ec76e1c01848b4e8e49f.tar.gz | |
KVM: fix cpuid E2BIG handling for extended request types
If we run out of cpuid entries for extended request types
we should return -E2BIG, just like we do for the standard
request types.
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kvm/x86.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index a93ba37..25a1c57 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1506,6 +1506,10 @@ static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, for (func = 0x80000001; func <= limit && nent < cpuid->nent; ++func) do_cpuid_ent(&cpuid_entries[nent], func, 0, &nent, cpuid->nent); + r = -E2BIG; + if (nent >= cpuid->nent) + goto out_free; + r = -EFAULT; if (copy_to_user(entries, cpuid_entries, nent * sizeof(struct kvm_cpuid_entry2))) |
