From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sheng Yang Subject: [PATCH 1/1] KVM: Fix kernel allocated memory slot Date: Tue, 11 Nov 2008 15:30:40 +0800 Message-ID: <1226388640-32200-1-git-send-email-sheng@linux.intel.com> References: Cc: kvm@vger.kernel.org, "\\\"Hollis Blanchard\\\"" , Sheng Yang To: Avi Kivity Return-path: Received: from mga14.intel.com ([143.182.124.37]:37938 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751500AbYKKHdp (ORCPT ); Tue, 11 Nov 2008 02:33:45 -0500 In-Reply-To: Sender: kvm-owner@vger.kernel.org List-ID: Commit 7fd49de9773fdcb7b75e823b21c1c5dc1e218c14 "KVM: ensure that memslot userspace addresses are page-aligned" broke kernel space allocated memory slot, for the userspace_addr is invalid. Signed-off-by: Sheng Yang --- virt/kvm/kvm_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 0a0a959..4727c08 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -715,7 +715,7 @@ int __kvm_set_memory_region(struct kvm *kvm, goto out; if (mem->guest_phys_addr & (PAGE_SIZE - 1)) goto out; - if (mem->userspace_addr & (PAGE_SIZE - 1)) + if (user_alloc && (mem->userspace_addr & (PAGE_SIZE - 1))) goto out; if (mem->slot >= KVM_MEMORY_SLOTS + KVM_PRIVATE_MEM_SLOTS) goto out; -- 1.5.4.5