Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760405AbWLFKAq (ORCPT ); Wed, 6 Dec 2006 05:00:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760408AbWLFKAp (ORCPT ); Wed, 6 Dec 2006 05:00:45 -0500 Received: from mail.renesas.com ([202.234.163.13]:53111 "EHLO mail03.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1760405AbWLFKAp (ORCPT ); Wed, 6 Dec 2006 05:00:45 -0500 Date: Wed, 06 Dec 2006 19:00:40 +0900 From: Hirokazu Takata Subject: [PATCH 2.6.19] m32r: Fix access error handler to pass full 32-bit address To: Andrew Morton Cc: linux-kernel@vger.kernel.org, takata@linux-m32r.org Message-id: MIME-version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-type: text/plain; charset=US-ASCII User-Agent: Wanderlust/2.14.0 (Africa) Emacs/21.4 Mule/5.0 (SAKAKI) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1761 Lines: 59 Don't mask the lower 12-bit of the page fault address. In the current m32r kernel implementation, we use an access error handler to detect page faults. 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 --- arch/m32r/kernel/entry.S | 2 -- arch/m32r/mm/fault.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S index 5b01fd2..a2c472c 100644 --- a/arch/m32r/kernel/entry.S +++ b/arch/m32r/kernel/entry.S @@ -596,8 +596,6 @@ ENTRY(ace_handler) beqz r1, inst oprand: ld r2, @(low(MDEVA_offset),r2) ; set address - srli r2, #12 - slli r2, #12 srli r1, #1 bra 1f inst: diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c index 8d5f551..9b9feb0 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, goto good_area; if (!(vma->vm_flags & VM_GROWSDOWN)) goto bad_area; -#if 0 + if (error_code & ACE_USERMODE) { /* * 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) goto bad_area; } -#endif + if (expand_stack(vma, address)) goto bad_area; /* -- 1.4.4.1 -- Hirokazu Takata Linux/M32R Project: http://www.linux-m32r.org/ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/