diff options
| author | Sheng Yang <sheng@linux.intel.com> | 2008-11-11 15:30:40 +0800 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2008-12-31 16:52:25 +0200 |
| commit | e7cacd40d20849f69c908f1290c714145073685a (patch) | |
| tree | 299d775e4336770e61751a2e7a5778a23efa0ff4 /virt/kvm/kvm_main.c | |
| parent | 30ed5bb685ab03c9bdf812502900b65087d61490 (diff) | |
| download | talos-obmc-linux-e7cacd40d20849f69c908f1290c714145073685a.tar.gz talos-obmc-linux-e7cacd40d20849f69c908f1290c714145073685a.zip | |
KVM: Fix kernel allocated memory slot
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 <sheng@linux.intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'virt/kvm/kvm_main.c')
| -rw-r--r-- | 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 0a0a9595ba3b..4727c08da2e9 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; |
