svn commit: r285268 - head/sys/arm64/arm64

[Andrew Turner]

Author: andrew
Date: Wed Jul  8 12:42:44 2015
New Revision: 285268
URL: https://svnweb.freebsd.org/changeset/base/285268

Log:
  Send the correct signal when vm_fault fails. While here also set the code
  and address fields.
  
  Sponsored by: ABT Systems Ltd

Modified:
  head/sys/arm64/arm64/trap.c

Modified: head/sys/arm64/arm64/trap.c
==============================================================================
--- head/sys/arm64/arm64/trap.c Wed Jul  8 12:08:58 2015        (r285267)
+++ head/sys/arm64/arm64/trap.c Wed Jul  8 12:42:44 2015        (r285268)
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_map.h>
+#include <vm/vm_param.h>
 #include <vm/vm_extern.h>
 
 #include <machine/frame.h>
@@ -79,13 +80,14 @@ void do_el0_error(struct trapframe *);
 int (*dtrace_invop_jump_addr)(struct trapframe *);
 
 static __inline void
-call_trapsignal(struct thread *td, int sig, u_long code)
+call_trapsignal(struct thread *td, int sig, int code, void *addr)
 {
        ksiginfo_t ksi;
 
        ksiginfo_init_trap(&ksi);
        ksi.ksi_signo = sig;
-       ksi.ksi_code = (int)code;
+       ksi.ksi_code = code;
+       ksi.ksi_addr = addr;
        trapsignal(td, &ksi);
 }
 
@@ -151,7 +153,7 @@ data_abort(struct trapframe *frame, uint
        vm_prot_t ftype;
        vm_offset_t va;
        uint64_t far;
-       int error, sig;
+       int error, sig, ucode;
 
        td = curthread;
        pcb = td->td_pcb;
@@ -204,13 +206,14 @@ data_abort(struct trapframe *frame, uint
                error = vm_fault(map, va, ftype, VM_FAULT_NORMAL);
        }
 
-       if (error != 0) {
+       if (error != KERN_SUCCESS) {
                if (lower) {
-                       if (error == ENOMEM)
-                               sig = SIGKILL;
+                       sig = SIGSEGV;
+                       if (error == KERN_PROTECTION_FAILURE)
+                               ucode = SEGV_ACCERR;
                        else
-                               sig = SIGSEGV;
-                       call_trapsignal(td, sig, 0);
+                               ucode = SEGV_MAPERR;
+                       call_trapsignal(td, sig, ucode, (void *)far);
                } else {
                        if (td->td_intr_nesting_level == 0 &&
                            pcb->pcb_onfault != 0) {
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"