Module Name: src
Committed By: martin
Date: Mon Mar 2 13:36:36 UTC 2015
Modified Files:
src/sys/arch/arm/arm32: fault.c
Log Message:
Handle EINVAL in the fault path and send SIGBUS for mmap acces past EOF.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/arm/arm32/fault.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/fault.c
diff -u src/sys/arch/arm/arm32/fault.c:1.102 src/sys/arch/arm/arm32/fault.c:1.103
--- src/sys/arch/arm/arm32/fault.c:1.102 Sat Oct 25 10:58:12 2014
+++ src/sys/arch/arm/arm32/fault.c Mon Mar 2 13:36:36 2015
@@ -1,4 +1,4 @@
-/* $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.
@@ -81,7 +81,7 @@
#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>
@@ -507,15 +507,26 @@ data_abort_handler(trapframe_t *tf)
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 = (error == EACCES) ? SEGV_ACCERR : SEGV_MAPERR;
+ ksi.ksi_code = SEGV_ACCERR;
+ 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);
