diff options
| author | Jeff Dike <jdike@addtoit.com> | 2005-05-20 22:59:08 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-21 00:48:17 +0200 |
| commit | 13479d52c7a61a18900d7f36730b7d3b43723d97 (patch) | |
| tree | b8c23b0a7d06155ca7a8a7f5c0c55dbc5cbd870e /arch/um | |
| parent | [PATCH] uml: small fixes left over from rc4 (diff) | |
| download | linux-13479d52c7a61a18900d7f36730b7d3b43723d97.tar.xz linux-13479d52c7a61a18900d7f36730b7d3b43723d97.zip | |
[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/um')
| -rw-r--r-- | arch/um/kernel/trap_kern.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/um/kernel/trap_kern.c b/arch/um/kernel/trap_kern.c index 5fca2c61eb98..9ae2eff0d8f3 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)){ |