Re: [PATCH v4] KVM: Fix stack-out-of-bounds read in write_mmio

[Wanpeng Li <kernellwp@xxxxxxxxx>]

2017-12-18 19:55 GMT+08:00 Paolo Bonzini <pbonzini@xxxxxxxxxx>:
> On 15/12/2017 12:06, Marc Zyngier wrote:
>> Assuming you address the above:
>>
>> Reviewed-by: Marc Zyngier <marc.zyngier@xxxxxxx>
>> Tested-by: Marc Zyngier <marc.zyngier@xxxxxxx>
>
> Done as follows:
>
> diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h
> index dfd21708694f..0a016bd14c2d 100644
> --- a/include/trace/events/kvm.h
> +++ b/include/trace/events/kvm.h
> @@ -227,7 +227,8 @@
>                 __entry->gpa            = gpa;
>                 __entry->val = 0;
>                 if (val)
> -                       memcpy(&__entry->val, val, min(8, len));
> +                       memcpy(&__entry->val, val,
> +                              min_t(u32, sizeof(__entry->val), len));
>         ),
>
>         TP_printk("mmio %s len %u gpa 0x%llx val 0x%llx",

Thanks Paolo. :)

Regards,
Wanpeng Li