diff options
| author | Hirokazu Takata <takata@linux-m32r.org> | 2006-12-08 05:35:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:37 -0500 |
| commit | 6b8bd3f4b2e9d0fbfd0e7d75ba1cdc79c6876ecc (patch) | |
| tree | 1bdd60f28f6e10747b19dade59b8e055a69ca75d /arch/m32r/mm/fault.c | |
| parent | f894cb5c938de467e208e5934c90cb9deee7dc46 (diff) | |
[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>
Diffstat (limited to 'arch/m32r/mm/fault.c')
| -rw-r--r-- | arch/m32r/mm/fault.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c index 8d5f551b5754..9b9feb0f1610 100644 --- a/arch/m32r/mm/fault.c +++ b/arch/m32r/mm/fault.c | |||
| @@ -173,7 +173,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code, | |||
| 173 | goto good_area; | 173 | goto good_area; |
| 174 | if (!(vma->vm_flags & VM_GROWSDOWN)) | 174 | if (!(vma->vm_flags & VM_GROWSDOWN)) |
| 175 | goto bad_area; | 175 | goto bad_area; |
| 176 | #if 0 | 176 | |
| 177 | if (error_code & ACE_USERMODE) { | 177 | if (error_code & ACE_USERMODE) { |
| 178 | /* | 178 | /* |
| 179 | * accessing the stack below "spu" is always a bug. | 179 | * 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, | |||
| 184 | if (address + 4 < regs->spu) | 184 | if (address + 4 < regs->spu) |
| 185 | goto bad_area; | 185 | goto bad_area; |
| 186 | } | 186 | } |
| 187 | #endif | 187 | |
| 188 | if (expand_stack(vma, address)) | 188 | if (expand_stack(vma, address)) |
| 189 | goto bad_area; | 189 | goto bad_area; |
| 190 | /* | 190 | /* |
