Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle EINVAL in the fault path and send SIGBUS on mmap'd access past EOF.

This commit is contained in:
martin 2015-03-03 20:36:31 +00:00
parent 1fddf0eec4
commit c39c2a5c70
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/arch/mac68k/mac68k/trap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trap.c,v 1.146 2012/02/19 21:06:15 rmind Exp $ */
/* $NetBSD: trap.c,v 1.147 2015/03/03 20:36:31 martin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.146 2012/02/19 21:06:15 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.147 2015/03/03 20:36:31 martin Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@ -585,11 +585,6 @@ copyfault:
}
goto out;
}
if (rv == EACCES) {
ksi.ksi_code = SEGV_ACCERR;
rv = EFAULT;
} else
ksi.ksi_code = SEGV_MAPERR;
if (type == T_MMUFLT) {
if (onfault)
goto copyfault;
@ -600,14 +595,26 @@ copyfault:
goto dopanic;
}
ksi.ksi_addr = (void *)v;
if (rv == ENOMEM) {
switch (rv) {
case ENOMEM:
printf("UVM: pid %d (%s), uid %d killed: out of swap\n",
p->p_pid, p->p_comm,
l->l_cred ?
kauth_cred_geteuid(l->l_cred) : -1);
ksi.ksi_signo = SIGKILL;
} else {
break;
case EINVAL:
ksi.ksi_signo = SIGBUS;
ksi.ksi_code = BUS_ADRERR;
break;
case EACCES:
ksi.ksi_signo = SIGSEGV;
ksi.ksi_code = SEGV_ACCERR;
break;
default:
ksi.ksi_signo = SIGSEGV;
ksi.ksi_code = SEGV_MAPERR;
break;
}
break;
}