aboutsummaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorJan Engelmohr <jan.engelmohr@mailbox.tu-dresden.de>2016-07-26 18:30:48 +0200
committerMoyster <oysterized@gmail.com>2016-08-26 16:00:37 +0200
commit8e93e2bdfbb2ebf00a0b4f6d1693d7f5f8a66d4e (patch)
tree9a8c0423c73fea9c74735f0979b6dc142e9f162f /arch/s390
parentd668de80d065e7796d2fb31cf2c66084850baa2f (diff)
3.10.75 -> 3.10.76
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/mm/fault.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 416facec4..d214321db 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -244,6 +244,12 @@ static noinline void do_fault_error(struct pt_regs *regs, int fault)
do_no_context(regs);
else
pagefault_out_of_memory();
+ } else if (fault & VM_FAULT_SIGSEGV) {
+ /* Kernel mode? Handle exceptions or die */
+ if (!user_mode(regs))
+ do_no_context(regs);
+ else
+ do_sigsegv(regs, SEGV_MAPERR);
} else if (fault & VM_FAULT_SIGBUS) {
/* Kernel mode? Handle exceptions or die */
if (!user_mode(regs))