Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933409AbdLRLzN (ORCPT ); Mon, 18 Dec 2017 06:55:13 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:40637 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932341AbdLRLzJ (ORCPT ); Mon, 18 Dec 2017 06:55:09 -0500 X-Google-Smtp-Source: ACJfBou3kxLKhUPzTVmfGJWWT76GZ70PszPuWsTr9VH2NhYGI5Iu2FzODvKsXphHrcCHlEP4O0oODw== Subject: Re: [PATCH v4] KVM: Fix stack-out-of-bounds read in write_mmio To: Marc Zyngier , Wanpeng Li , linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , Wanpeng Li , Christoffer Dall References: <1513302050-14253-1-git-send-email-wanpeng.li@hotmail.com> <15b7b9e5-5b11-f20f-0260-5c8b9fc5e111@arm.com> From: Paolo Bonzini Message-ID: <17d27b8d-908b-a740-1d2d-e92a8507f25b@redhat.com> Date: Mon, 18 Dec 2017 12:55:05 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <15b7b9e5-5b11-f20f-0260-5c8b9fc5e111@arm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 651 Lines: 26 On 15/12/2017 12:06, Marc Zyngier wrote: > Assuming you address the above: > > Reviewed-by: Marc Zyngier > Tested-by: Marc Zyngier 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