From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH] KVM: Fix EPT identity IOCTL on 32pae Date: Mon, 03 Aug 2009 15:25:43 +0300 Message-ID: <4A76D747.2060506@redhat.com> References: <1249280247-6732-1-git-send-email-sheng@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Marcelo Tosatti , kvm@vger.kernel.org To: Sheng Yang Return-path: Received: from mx2.redhat.com ([66.187.237.31]:39265 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754629AbZHCMU3 (ORCPT ); Mon, 3 Aug 2009 08:20:29 -0400 In-Reply-To: <1249280247-6732-1-git-send-email-sheng@linux.intel.com> Sender: kvm-owner@vger.kernel.org List-ID: On 08/03/2009 09:17 AM, Sheng Yang wrote: > Copy u64 from guest result in chaos. > > Also fix a mistake of still using old macro rather than new variable(). > > Signed-off-by: Sheng Yang > --- > arch/x86/kvm/vmx.c | 2 +- > arch/x86/kvm/x86.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c > index 7931c72..c5aaa1b 100644 > --- a/arch/x86/kvm/vmx.c > +++ b/arch/x86/kvm/vmx.c > @@ -2199,7 +2199,7 @@ static int alloc_identity_pagetable(struct kvm *kvm) > goto out; > > kvm->arch.ept_identity_pagetable = gfn_to_page(kvm, > - VMX_EPT_IDENTITY_PAGETABLE_ADDR>> PAGE_SHIFT); > + kvm->arch.ept_identity_map_addr>> PAGE_SHIFT); > This is a fix, but as Jan says, separate patch. > out: > up_write(&kvm->slots_lock); > return r; > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index 2539e9a..977b705 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -2178,7 +2178,7 @@ long kvm_arch_vm_ioctl(struct file *filp, > goto out; > break; > case KVM_SET_IDENTITY_MAP_ADDR: { > - u64 ident_addr; > + unsigned long ident_addr; > > r = -EFAULT; > if (copy_from_user(&ident_addr, argp, sizeof ident_addr)) > This doesn't look right. Consider 32-bit userspace running on a 32-bit kernel and the same userspace running on a 64-bit kernel. We need to copy the same size in both cases. -- error compiling committee.c: too many arguments to function