[src/trunk]: src/sys/arch/powerpc/powerpc set signo and code correctly for si...

[chs <chs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f0621fb9d9c7
branches:  trunk
changeset: 351980:f0621fb9d9c7
user:      chs <chs%NetBSD.org@localhost>
date:      Thu Mar 09 00:15:06 2017 +0000

description:
set signo and code correctly for signals triggered by uvm_fault() errors.

diffstat:

 sys/arch/powerpc/powerpc/trap.c |  37 ++++++++++++++++++++++---------------
 1 files changed, 22 insertions(+), 15 deletions(-)

diffs (70 lines):

diff -r 94400311e818 -r f0621fb9d9c7 sys/arch/powerpc/powerpc/trap.c
--- a/sys/arch/powerpc/powerpc/trap.c   Thu Mar 09 00:14:03 2017 +0000
+++ b/sys/arch/powerpc/powerpc/trap.c   Thu Mar 09 00:15:06 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.151 2017/02/27 06:54:00 chs Exp $   */
+/*     $NetBSD: trap.c,v 1.152 2017/03/09 00:15:06 chs Exp $   */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.151 2017/02/27 06:54:00 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.152 2017/03/09 00:15:06 chs Exp $");
 
 #include "opt_altivec.h"
 #include "opt_ddb.h"
@@ -262,18 +262,28 @@
                            tf->tf_dar, tf->tf_srr0, tf->tf_dsisr, rv);
                }
                KSI_INIT_TRAP(&ksi);
-               ksi.ksi_signo = SIGSEGV;
                ksi.ksi_trap = EXC_DSI;
                ksi.ksi_addr = (void *)tf->tf_dar;
-               ksi.ksi_code =
-                   (tf->tf_dsisr & DSISR_PROTECT ? SEGV_ACCERR : SEGV_MAPERR);
-               if (rv == ENOMEM) {
+vm_signal:
+               switch (rv) {
+               case EINVAL:
+                       ksi.ksi_signo = SIGBUS;
+                       ksi.ksi_code = BUS_ADRERR;
+                       break;
+               case EACCES:
+                       ksi.ksi_signo = SIGSEGV;
+                       ksi.ksi_code = SEGV_ACCERR;
+                       break;
+               case ENOMEM:
+                       ksi.ksi_signo = SIGKILL;
                        printf("UVM: pid %d.%d (%s), uid %d killed: "
-                              "out of swap\n",
-                              p->p_pid, l->l_lid, p->p_comm,
-                              l->l_cred ?
-                              kauth_cred_geteuid(l->l_cred) : -1);
-                       ksi.ksi_signo = SIGKILL;
+                              "out of swap\n", p->p_pid, l->l_lid, p->p_comm,
+                              l->l_cred ? kauth_cred_geteuid(l->l_cred) : -1);
+                       break;
+               default:
+                       ksi.ksi_signo = SIGSEGV;
+                       ksi.ksi_code = SEGV_MAPERR;
+                       break;
                }
                (*p->p_emul->e_trapsignal)(l, &ksi);
                break;
@@ -323,12 +333,9 @@
                            tf->tf_srr0, tf->tf_srr1);
                }
                KSI_INIT_TRAP(&ksi);
-               ksi.ksi_signo = SIGSEGV;
                ksi.ksi_trap = EXC_ISI;
                ksi.ksi_addr = (void *)tf->tf_srr0;
-               ksi.ksi_code = (rv == EACCES ? SEGV_ACCERR : SEGV_MAPERR);
-               (*p->p_emul->e_trapsignal)(l, &ksi);
-               break;
+               goto vm_signal;
 
        case EXC_FPU|EXC_USER:
                ci->ci_ev_fpu.ev_count++;