Module Name: src
Committed By: martin
Date: Sat Dec 28 13:48:07 UTC 2024
Modified Files:
src/sys/arch/sparc64/sparc64: trap.c
Log Message:
PR 58936: do not panic if we hit a VA-hole address in copyin/copyout.
To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 src/sys/arch/sparc64/sparc64/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/sparc64/sparc64/trap.c
diff -u src/sys/arch/sparc64/sparc64/trap.c:1.198 src/sys/arch/sparc64/sparc64/trap.c:1.199
--- src/sys/arch/sparc64/sparc64/trap.c:1.198 Mon May 13 00:12:33 2024
+++ src/sys/arch/sparc64/sparc64/trap.c Sat Dec 28 13:48:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.198 2024/05/13 00:12:33 msaitoh Exp $ */
+/* $NetBSD: trap.c,v 1.199 2024/12/28 13:48:07 martin Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.198 2024/05/13 00:12:33 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.199 2024/12/28 13:48:07 martin Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -1087,8 +1087,15 @@ data_access_fault(struct trapframe64 *tf
/* deal with invalid VAs early */
if (__predict_false(addr >= (1UL<<HOLESHIFT) && addr < (1UL<<63))) {
- if (tstate & TSTATE_PRIV)
+ if (tstate & TSTATE_PRIV) {
+ if (onfault) {
+ tf->tf_pc = onfault;
+ tf->tf_npc = onfault + 4;
+ tf->tf_out[0] = EFAULT;
+ return;
+ }
panic("fault type %u for invalid va %lx", type, addr);
+ }
KSI_INIT_TRAP(&ksi);
ksi.ksi_signo = SIGSEGV;
