From 70c8abc28762d04e36c92e07eee2ce6ab41049cb Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Fri, 19 Feb 2016 14:28:58 +0000
Subject: [PATCH] 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>
---
arch/arm64/mm/fault.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index a8eafeceb08a5..44e56de23f792 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);
}
/*
--
2.30.2