Re: [PATCH] KVM: x86: Assign correct value to array.maxnent

[Xiaoyao Li]

On 6/4/2020 10:43 AM, Xiaoyao Li wrote:
> Delay the assignment of array.maxnent to use correct value for the case
> cpuid->nent > KVM_MAX_CPUID_ENTRIES.
>
> Fixes: e53c95e8d41e ("KVM: x86: Encapsulate CPUID entries and metadata in struct")
> Signed-off-by: Xiaoyao Li <xiaoyao.li@xxxxxxxxx>
> ---
>   arch/x86/kvm/cpuid.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
> index 253b8e875ccd..befff01d100c 100644
> --- a/arch/x86/kvm/cpuid.c
> +++ b/arch/x86/kvm/cpuid.c
> @@ -870,7 +870,6 @@ int kvm_dev_ioctl_get_cpuid(struct kvm_cpuid2 *cpuid,
>   
>   	struct kvm_cpuid_array array = {
>   		.nent = 0,
> -		.maxnent = cpuid->nent,
>   	};
>   	int r, i;
>   
> @@ -887,6 +886,8 @@ int kvm_dev_ioctl_get_cpuid(struct kvm_cpuid2 *cpuid,
>   	if (!array.entries)
>   		return -ENOMEM;
>   
> +	array.maxnent = cpuid->nent;

Miss the fact that maxnent is const, V2 is coming.

> +
>   	for (i = 0; i < ARRAY_SIZE(funcs); i++) {
>   		r = get_cpuid_func(&array, funcs[i], type);
>   		if (r)