Skip to content

Commit

Permalink
arm64: User die() instead of panic() in do_page_fault()
Browse files Browse the repository at this point in the history
The former gives better error reporting on unhandled permission faults
(introduced by the UAO patches).

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  • Loading branch information
Catalin Marinas committed Feb 19, 2016
1 parent a7f8de1 commit 70c8abc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm64/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand Down

0 comments on commit 70c8abc

Please sign in to comment.