KVM: fix cpuid E2BIG handling for extended request types
PATCH 1/1 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 <[email protected]>
--- arch/x86/kvm/x86.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
arch/x86/kvm/x86.c +4 -0
@@ -1394,6 +1394,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 )))
Signature · 1 line
1.6.0.6
Avi Kivity
AppliedQuoted 4 lines · Mark McLoughlin
If we run out of cpuid entries for extended request types we should return
-E2BIG, just like we do for the standard request types.
Applied, thanks.
Signature · 1 line
Do not meddle in the internals of kernels, for they are subtle and quick to panic.