Mon Mar 2 13:36:36 2015 UTC ()

Handle EINVAL in the fault path and send SIGBUS for mmap acces past EOF.


(martin)

diff -r1.102 -r1.103 src/sys/arch/arm/arm32/fault.c

--- src/sys/arch/arm/arm32/fault.c 2014/10/25 10:58:12	1.102
+++ src/sys/arch/arm/arm32/fault.c 2015/03/02 13:36:36	1.103

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fault.c,v 1.102 2014/10/25 10:58:12 skrll Exp $	*/
+/*	$NetBSD: fault.c,v 1.103 2015/03/02 13:36:36 martin Exp $	*/
 /*
  * Copyright 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Steve C. Woodford for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -71,27 +71,27 @@
  * RiscBSD kernel project
+ *
  * fault.c
+ *
  * Fault handlers
+ *
  * Created      : 28/11/94
  */
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include <sys/types.h>
-__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.102 2014/10/25 10:58:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.103 2015/03/02 13:36:36 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/kauth.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_stat.h>
 #ifdef UVMHIST
 #include <uvm/uvm.h>
 @@ -497,35 +497,46 @@ data_abort_handler(trapframe_t *tf)
 		if (pcb->pcb_onfault) {
 			tf->tf_r0 = error;
 			tf->tf_pc = (register_t)(intptr_t) pcb->pcb_onfault;
 			return;
+		}
 		printf("\nuvm_fault(%p, %lx, %x) -> %x\n", map, va, ftype,
 		    error);
 		dab_fatal(tf, fsr, far, l, NULL);
+	}
 	KSI_INIT_TRAP(&ksi);
-	if (error == ENOMEM) {
+	switch (error) {
 	case ENOMEM:
 		printf("UVM: pid %d (%s), uid %d killed: "
 		    "out of swap\n", l->l_proc->p_pid, l->l_proc->p_comm,
 		    l->l_cred ? kauth_cred_geteuid(l->l_cred) : -1);
 		ksi.ksi_signo = SIGKILL;
-	} else
+		break;
 	case EACCES:
 		ksi.ksi_signo = SIGSEGV;
 		ksi.ksi_code = SEGV_ACCERR;
-	ksi.ksi_code = (error == EACCES) ? SEGV_ACCERR : SEGV_MAPERR;
+		break;
 	case EINVAL:
 		ksi.ksi_signo = SIGBUS;
 		ksi.ksi_code = BUS_ADRERR;
 		break;
 	default:
 		ksi.ksi_signo = SIGSEGV;
 		ksi.ksi_code = SEGV_MAPERR;
 		break;
+	}
 	ksi.ksi_addr = (uint32_t *)(intptr_t) far;
 	ksi.ksi_trap = fsr;
 	UVMHIST_LOG(maphist, " <- error (%d)", error, 0, 0, 0);
 do_trapsignal:
 	call_trapsignal(l, tf, &ksi);
 out:
 	/* If returning to user mode, make sure to invoke userret() */
 	if (user)
 		userret(l);
+}
 /*