diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2016-02-19 14:28:58 (GMT) |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2016-02-19 14:28:58 (GMT) |
| commit | 70c8abc28762d04e36c92e07eee2ce6ab41049cb (patch) | |
| tree | 71ec5f76b0624ce0eeff7484c13f9820ed876776 /arch/arm64/mm/fault.c | |
| parent | a7f8de168ace487fa7b88cb154e413cf40e87fc6 (diff) | |
| download | linux-70c8abc28762d04e36c92e07eee2ce6ab41049cb.tar.xz | |
arm64: User die() instead of panic() in do_page_fault()
The former gives better error reporting on unhandled permission faults
(introduced by the UAO patches).
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/mm/fault.c')
| -rw-r--r-- | arch/arm64/mm/fault.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index a8eafece..44e56de 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -235,10 +235,10 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, if (permission_fault(esr) && (addr < USER_DS)) { if (get_fs() == KERNEL_DS) - panic("Accessing user space memory with fs=KERNEL_DS"); + die("Accessing user space memory with fs=KERNEL_DS", regs, esr); if (!search_exception_tables(regs->pc)) - panic("Accessing user space memory outside uaccess.h routines"); + die("Accessing user space memory outside uaccess.h routines", regs, esr); } /* |