shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: arm64: User die() instead of panic() in do_page_fault()

Browse Source 
The former gives better error reporting on unhandled permission faults
(introduced by the UAO patches).

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

Bug: 30369029
Patchset: kaslr-arm64-4.4

(cherry picked from commit 70c8abc287)
Signed-off-by: Jeff Vander Stoep <jeffv@google.com>
Change-Id: Ia419eccf1554a32fa4131ac15b277d4d2d4eb508
This commit is contained in:
Catalin Marinas
2016-02-19 14:28:58 +00:00
committed by Jeff Vander Stoep
parent cb4d47d9a2
commit 298b730c26
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}
/*