Module Name: src
Committed By: mlelstv
Date: Sat May 4 13:45:10 UTC 2024
Modified Files:
src/sys/arch/amiga/amiga: trap.c
Log Message:
Don't panic on NULL pointer dereference when done by copyin, ...
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/amiga/amiga/trap.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/amiga/amiga/trap.c
diff -u src/sys/arch/amiga/amiga/trap.c:1.142 src/sys/arch/amiga/amiga/trap.c:1.143
--- src/sys/arch/amiga/amiga/trap.c:1.142 Sat Jan 20 00:15:30 2024
+++ src/sys/arch/amiga/amiga/trap.c Sat May 4 13:45:10 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.142 2024/01/20 00:15:30 thorpej Exp $ */
+/* $NetBSD: trap.c,v 1.143 2024/05/04 13:45:10 mlelstv Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -45,7 +45,7 @@
#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.142 2024/01/20 00:15:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.143 2024/05/04 13:45:10 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -364,7 +364,7 @@ trapmmufault(int type, u_int code, u_int
ftype = VM_PROT_READ;
va = trunc_page((vaddr_t)v);
#ifdef DEBUG
- if (map == kernel_map && va == 0) {
+ if (map == kernel_map && va == 0 && onfault == 0) {
printf("trap: bad kernel access at %x pc %x\n", v, fp->f_pc);
panictrap(type, code, v, fp);
}
