hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH] m32r: fix ace_handler to pass full 32-bit address 

Don't mask the lower 12-bit of the page fault address.

In the current m32r kernel implementation, we use an access exception
to detect page faults.

This patch fixes ace_handler (access exception handler) for m32r.  In order to
check userspace address in do_page_fault, we have to pass full 32-bit address
to do_page_fault.

Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Hirokazu Takata 2006-12-08 02:35:56 -08:00 committed by Linus Torvalds
parent f894cb5c93
commit 6b8bd3f4b2
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/m32r/kernel/entry.S
View File

@ -596,8 +596,6 @@ ENTRY(ace_handler)
beqz r1, inst beqz r1, inst
oprand: oprand:
ld r2, @(low(MDEVA_offset),r2) ; set address ld r2, @(low(MDEVA_offset),r2) ; set address
srli r2, #12
slli r2, #12
srli r1, #1 srli r1, #1
bra 1f bra 1f
inst: inst:

4
arch/m32r/mm/fault.c
View File

@ -173,7 +173,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code,
goto good_area; goto good_area;
if (!(vma->vm_flags & VM_GROWSDOWN)) if (!(vma->vm_flags & VM_GROWSDOWN))
goto bad_area; goto bad_area;
#if 0
if (error_code & ACE_USERMODE) { if (error_code & ACE_USERMODE) {
/* /*
* accessing the stack below "spu" is always a bug. * accessing the stack below "spu" is always a bug.
@ -184,7 +184,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code,
if (address + 4 < regs->spu) if (address + 4 < regs->spu)
goto bad_area; goto bad_area;
} }
#endif
if (expand_stack(vma, address)) if (expand_stack(vma, address))
goto bad_area; goto bad_area;
/* /*