summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2005-05-20 13:59:08 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-20 15:48:17 -0700
commit13479d52c7a61a18900d7f36730b7d3b43723d97 (patch)
treeb8c23b0a7d06155ca7a8a7f5c0c55dbc5cbd870e /arch
parentba9950c820e556e39cd26581826b5581a64fb641 (diff)
downloadop-kernel-dev-13479d52c7a61a18900d7f36730b7d3b43723d97.zip
op-kernel-dev-13479d52c7a61a18900d7f36730b7d3b43723d97.tar.gz
[PATCH] uml: Page fault fixes
Any access to a PROT_NONE page should segfault the process. A JVM seems to do this on purpose. Also, Al noticed some bogus code, which is now deleted. Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/um/kernel/trap_kern.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/um/kernel/trap_kern.c b/arch/um/kernel/trap_kern.c
index 5fca2c6..9ae2eff 100644
--- a/arch/um/kernel/trap_kern.c
+++ b/arch/um/kernel/trap_kern.c
@@ -57,10 +57,11 @@ int handle_page_fault(unsigned long address, unsigned long ip,
*code_out = SEGV_ACCERR;
if(is_write && !(vma->vm_flags & VM_WRITE))
goto out;
+
+ if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
+ goto out;
+
page = address & PAGE_MASK;
- pgd = pgd_offset(mm, page);
- pud = pud_offset(pgd, page);
- pmd = pmd_offset(pud, page);
do {
survive:
switch (handle_mm_fault(mm, vma, address, is_write)){
OpenPOWER on IntegriCloud