summaryrefslogtreecommitdiffstats
path: root/arch/um/include/asm/Kbuild
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2021-01-13 22:09:44 +0100
committerRichard Weinberger <richard@nod.at>2021-02-12 21:37:38 +0100
commitbfc58e2b98e99737409cd9f4d86a79677c5b887c (patch)
treee73fa8fa0c10f6129ed4b80028cba003dc5d69c5 /arch/um/include/asm/Kbuild
parent9f0b4807a44ff81cf59421c8a86641efec586610 (diff)
downloadlinux-bfc58e2b98e99737409cd9f4d86a79677c5b887c.tar.gz
linux-bfc58e2b98e99737409cd9f4d86a79677c5b887c.tar.bz2
linux-bfc58e2b98e99737409cd9f4d86a79677c5b887c.zip
um: remove process stub VMA
This mostly reverts the old commit 3963333fe676 ("uml: cover stubs with a VMA") which had added a VMA to the existing PTEs. However, there's no real reason to have the PTEs in the first place and the VMA cannot be 'fixed' in place, which leads to bugs that userspace could try to unmap them and be forcefully killed, or such. Also, there's a bit of an ugly hole in userspace's address space. Simplify all this: just install the stub code/page at the top of the (inner) address space, i.e. put it just above TASK_SIZE. The pages are simply hard-coded to be mapped in the userspace process we use to implement an mm context, and they're out of reach of the inner mmap/munmap/mprotect etc. since they're above TASK_SIZE. Getting rid of the VMA also makes vma_merge() no longer hit one of the VM_WARN_ON()s there because we installed a VMA while the code assumes the stack VMA is the first one. It also removes a lockdep warning about mmap_sem usage since we no longer have uml_setup_stubs() and thus no longer need to do any manipulation that would require mmap_sem in activate_mm(). Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/include/asm/Kbuild')
-rw-r--r--arch/um/include/asm/Kbuild1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild
index 314979467db1..a58811dc054c 100644
--- a/arch/um/include/asm/Kbuild
+++ b/arch/um/include/asm/Kbuild
@@ -25,3 +25,4 @@ generic-y += topology.h
generic-y += trace_clock.h
generic-y += word-at-a-time.h
generic-y += kprobes.h
+generic-y += mm_hooks.h