diff options
| author | Avi Kivity <avi@redhat.com> | 2010-09-17 13:13:14 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-26 17:18:33 -0700 |
| commit | aaf270ed0cb87db6a037a682a3d2f860efb32f59 (patch) | |
| tree | 124e7ade558b0239c55797db01e0ffa96315f155 | |
| parent | 1be501980f140e5a6698999df9c7c6124c14810f (diff) | |
| download | kernel-crypto-aaf270ed0cb87db6a037a682a3d2f860efb32f59.tar.gz kernel-crypto-aaf270ed0cb87db6a037a682a3d2f860efb32f59.tar.xz kernel-crypto-aaf270ed0cb87db6a037a682a3d2f860efb32f59.zip | |
KVM: Prevent internal slots from being COWed
commit 7ac77099ce88a0c31b75acd0ec5ef3da4415a6d8 upstream.
If a process with a memory slot is COWed, the page will change its address
(despite having an elevated reference count). This breaks internal memory
slots which have their physical addresses loaded into vmcs registers (see
the APIC access memory slot).
Signed-off-by: Avi Kivity <avi@redhat.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | arch/x86/kvm/x86.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 7fa89c39c64..fd2268838ca 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -5438,6 +5438,11 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, int user_alloc) { int npages = memslot->npages; + int map_flags = MAP_PRIVATE | MAP_ANONYMOUS; + + /* Prevent internal slot pages from being moved by fork()/COW. */ + if (memslot->id >= KVM_MEMORY_SLOTS) + map_flags = MAP_SHARED | MAP_ANONYMOUS; /*To keep backward compatibility with older userspace, *x86 needs to hanlde !user_alloc case. @@ -5450,7 +5455,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, userspace_addr = do_mmap(NULL, 0, npages * PAGE_SIZE, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, + map_flags, 0); up_write(¤t->mm->mmap_sem); |