Mon Mar 2 11:07:16 2015 UTC ()

Handle EINVAL in fault path, so mmap() access past EOF gets SIGBUS.


(martin)

diff -r1.131 -r1.132 src/sys/arch/alpha/alpha/trap.c

--- src/sys/arch/alpha/alpha/trap.c 2014/05/16 06:11:21	1.131
+++ src/sys/arch/alpha/alpha/trap.c 2015/03/02 11:07:16	1.132

 @@ -1,14 +1,14 @@
-/* $NetBSD: trap.c,v 1.131 2014/05/16 06:11:21 martin Exp $ */
+/* $NetBSD: trap.c,v 1.132 2015/03/02 11:07:16 martin Exp $ */
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, by Charles M. Hannum, and by Ross Harvey.
+ *
  * 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
 @@ -83,27 +83,27 @@
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #include "opt_fix_unaligned_vax_fp.h"
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.131 2014/05/16 06:11:21 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.132 2015/03/02 11:07:16 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/syscall.h>
 #include <sys/buf.h>
 #include <sys/kauth.h>
 #include <sys/kmem.h>
 #include <sys/cpu.h>
 #include <sys/atomic.h>
 #include <uvm/uvm_extern.h>
 @@ -486,39 +486,48 @@ do_fault:
 			if (user == 0) {
 				/* Check for copyin/copyout fault */
 				if (onfault != 0) {
 					framep->tf_regs[FRAME_PC] = onfault;
 					framep->tf_regs[FRAME_V0] = rv;
 					goto out;
+				}
 				goto dopanic;
+			}
 			KSI_INIT_TRAP(&ksi);
 			ksi.ksi_addr = (void *)a0;
 			ksi.ksi_trap = a1; /* MMCSR VALUE */
-			if (rv == ENOMEM) {
+			switch (rv) {
 			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 EINVAL:
 				ksi.ksi_signo = SIGBUS;
 				ksi.ksi_code = BUS_ADRERR;
 				break;
 			case EACCES:
 				ksi.ksi_signo = SIGSEGV;
 			if (rv == EACCES)
 				ksi.ksi_code = SEGV_ACCERR;
-			else
+				break;
 			default:
 				ksi.ksi_signo = SIGSEGV;
 				ksi.ksi_code = SEGV_MAPERR;
 				break;
+			}
 			break;
+		    }
 		default:
 			printf("trap: unknown MMCSR value 0x%lx\n", a1);
 			goto dopanic;
+		}
 		break;
 	default:
 		goto dopanic;
+	}