diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-06-25 16:17:21 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-06-25 16:19:06 +0800 |
| commit | bd4e9a26373331ef6f185500c72a8836eb7c82d9 (patch) | |
| tree | 13384e7649be7bb88ab9524efcbc602be85d5020 /arch/s390/mm/fault.c | |
| parent | 2528dbd348dd541e090594b7aac3f62351078388 (diff) | |
| parent | 2cb9802eeb7f919f97df05b16ec128f4f5af366d (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-androidlsk-v3.14-15.07-android
Conflicts:
fs/exec.c
Solutions:
follow commit d221244a7
sched: move no_new_privs into new atomic flags
to use task_no_new_privs(current).
Diffstat (limited to 'arch/s390/mm/fault.c')
| -rw-r--r-- | arch/s390/mm/fault.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index d95265b2719f..8e95432cc3b2 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -239,6 +239,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)) |