From 4c225b2705c7d72a8a0065b301f46a604404475a Mon Sep 17 00:00:00 2001
From: gbeauche <>
Date: Tue, 9 May 2006 06:24:05 +0000
Subject: [PATCH] MacOS X exception handling updates: - Call user handler for
 KERN_INVALID_ADDRESS too (SIGBUS) - Check for VALID_THREAD_STATE_FLAVOR in
 forward_exception() - Return KERN_FAILURE if forward_exception() got an
 unknown behavior code

---
 BasiliskII/src/Unix/sigsegv.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/BasiliskII/src/Unix/sigsegv.cpp b/BasiliskII/src/Unix/sigsegv.cpp
index b7c4f06a..994d69e5 100644
--- a/BasiliskII/src/Unix/sigsegv.cpp
+++ b/BasiliskII/src/Unix/sigsegv.cpp
@@ -614,7 +614,7 @@ if (ret != KERN_SUCCESS) { \
 #define SIGSEGV_SKIP_INSTRUCTION		ix86_skip_instruction
 #endif
 #define SIGSEGV_FAULT_ADDRESS			code[1]
-#define SIGSEGV_FAULT_HANDLER_INVOKE(ADDR, IP)	((code[0] == KERN_PROTECTION_FAILURE) ? sigsegv_fault_handler(ADDR, IP) : SIGSEGV_RETURN_FAILURE)
+#define SIGSEGV_FAULT_HANDLER_INVOKE(ADDR, IP)	((code[0] == KERN_PROTECTION_FAILURE || code[0] == KERN_INVALID_ADDRESS) ? sigsegv_fault_handler(ADDR, IP) : SIGSEGV_RETURN_FAILURE)
 #define SIGSEGV_FAULT_HANDLER_ARGLIST	mach_port_t thread, exception_data_t code, SIGSEGV_THREAD_STATE_TYPE *state
 #define SIGSEGV_FAULT_HANDLER_ARGS		thread, code, &state
 
@@ -1719,6 +1719,11 @@ forward_exception(mach_port_t thread_port,
 	behavior = oldExceptionPorts->behaviors[portIndex];
 	flavor = oldExceptionPorts->flavors[portIndex];
 
+	if (!VALID_THREAD_STATE_FLAVOR(flavor)) {
+		fprintf(stderr, "Invalid thread_state flavor = %d. Not forwarding\n", flavor);
+		return KERN_FAILURE;
+	}
+
 	/*
 	 fprintf(stderr, "forwarding exception, port = 0x%x, behaviour = %d, flavor = %d\n", port, behavior, flavor);
 	 */
@@ -1756,6 +1761,7 @@ forward_exception(mach_port_t thread_port,
 	  break;
 	default:
 	  fprintf(stderr, "forward_exception got unknown behavior\n");
+	  kret = KERN_FAILURE;
 	  break;
 	}
 
@@ -1765,7 +1771,7 @@ forward_exception(mach_port_t thread_port,
 		MACH_CHECK_ERROR (thread_set_state, kret);
 	}
 
-	return KERN_SUCCESS;
+	return kret;
 }
 
 /*