[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <853e8b51-ff54-a48d-8ce8-17060152382b@arm.com>
Date: Mon, 18 Dec 2017 12:06:09 +0000
From: Marc Zyngier <marc.zyngier@....com>
To: Paolo Bonzini <pbonzini@...hat.com>,
Wanpeng Li <kernellwp@...il.com>, linux-kernel@...r.kernel.org,
kvm@...r.kernel.org
Cc: Radim Krčmář <rkrcmar@...hat.com>,
Wanpeng Li <wanpeng.li@...mail.com>,
Christoffer Dall <christoffer.dall@...aro.org>
Subject: Re: [PATCH v4] KVM: Fix stack-out-of-bounds read in write_mmio
On 18/12/17 11:55, Paolo Bonzini wrote:
> On 15/12/2017 12:06, Marc Zyngier wrote:
>> Assuming you address the above:
>>
>> Reviewed-by: Marc Zyngier <marc.zyngier@....com>
>> Tested-by: Marc Zyngier <marc.zyngier@....com>
>
> 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",
>
Looks good to me.
Thanks,
M.
--
Jazz is not dead. It just smells funny...
Powered by blists - more mailing lists