aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2009-05-12 12:36:44 +0100
committerAvi Kivity <avi@redhat.com>2009-09-10 08:32:39 +0300
commitcb007648de83cf226d69ec76e1c01848b4e8e49f (patch)
treeddbffb8ad08a1805200ca61ba22b98ec086d0901
parent60af2ecdc53af5b941e4a2eb99862a7ccf3ed7c8 (diff)
downloadmrst-s0i3-test-cb007648de83cf226d69ec76e1c01848b4e8e49f.tar.gz
mrst-s0i3-test-cb007648de83cf226d69ec76e1c01848b4e8e49f.tar.xz
mrst-s0i3-test-cb007648de83cf226d69ec76e1c01848b4e8e49f.zip
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>
-rw-r--r--arch/x86/kvm/x86.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index a93ba37eb52..25a1c5739df 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)))