 @@ -1,14 +1,14 @@
-/*	$NetBSD: trap.c,v 1.125 2019/11/21 19:23:58 ad Exp $	*/
+/*	$NetBSD: trap.c,v 1.126 2020/03/08 00:53:12 pgoyette Exp $	*/
 /*
  * Copyright (c) 1998, 2000, 2017 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum, and by Maxime Villard.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer.
 @@ -54,53 +54,50 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)trap.c	7.4 (Berkeley) 5/13/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.125 2019/11/21 19:23:58 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.126 2020/03/08 00:53:12 pgoyette Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_xen.h"
 #include "opt_dtrace.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/acct.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/ras.h>
 #include <sys/signal.h>
 #include <sys/syscall.h>
 #include <sys/cpu.h>
 #include <sys/ucontext.h>
 #include <sys/module_hook.h>
 #include <sys/compat_stub.h>
 #include <uvm/uvm_extern.h>
 #ifdef COMPAT_NETBSD32
 #include <sys/exec.h>
 #include <compat/netbsd32/netbsd32_exec.h>
 #endif
 #include <machine/cpufunc.h>
 #include <x86/fpu.h>
 #include <x86/dbregs.h>
 #include <machine/psl.h>
 #include <machine/reg.h>
 #include <machine/trap.h>
 #include <machine/userret.h>
 #include <machine/db_machdep.h>
 #include <x86/nmi.h>
 #ifndef XENPV
 #include "isa.h"
 @@ -108,26 +105,31 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.1
 #include <sys/kgdb.h>
 #ifdef KDTRACE_HOOKS
 #include <sys/dtrace_bsd.h>
 /*
  * This is a hook which is initialized by the dtrace module to handle traps
  * which might occur during DTrace probe execution.
  */
 dtrace_trap_func_t dtrace_trap_func = NULL;
 dtrace_doubletrap_func_t dtrace_doubletrap_func = NULL;
 #endif
 /*
  * Module hook for amd64_oosyscall
  */
 struct amd64_oosyscall_hook_t amd64_oosyscall_hook;
 void nmitrap(struct trapframe *);
 void doubletrap(struct trapframe *);
 void trap(struct trapframe *);
 const char * const trap_type[] = {
 	"privileged instruction fault",		/*  0 T_PRIVINFLT */
 	"breakpoint trap",			/*  1 T_BPTFLT */
 	"arithmetic trap",			/*  2 T_ARITHTRAP */
 	"asynchronous system trap",		/*  3 T_ASTFLT */
 	"protection fault",			/*  4 T_PROTFLT */
 	"trace trap",				/*  5 T_TRCTRAP */
 	"page fault",				/*  6 T_PAGEFLT */
 	"alignment fault",			/*  7 T_ALIGNFLT */
 @@ -332,52 +334,33 @@ trap(struct trapframe *frame)
 		if (p == NULL)
 			goto we_re_toast;
 		/* Check for copyin/copyout fault. */
 		onfault = onfault_handler(pcb, frame);
 		if (onfault != NULL) {
 			onfault_restore(frame, onfault, EFAULT);
 			return;
+		}
 		goto we_re_toast;
 	case T_PROTFLT|T_USER:		/* protection fault */
-#if defined(COMPAT_NETBSD32) && defined(COMPAT_10)
+	{	int hook_ret;
-/*
+		MODULE_HOOK_CALL(amd64_oosyscall_hook, (p, frame),
- * XXX This code currently not included in loadable module;  it is
+			ENOSYS, hook_ret);
- * only included in built-in modules.
+		if (hook_ret == 0)
  */
 		static const char lcall[7] = { 0x9a, 0, 0, 0, 0, 7, 0 };
 		const size_t sz = sizeof(lcall);
 		char tmp[sizeof(lcall) /* Avoids VLA */];
 		/* Check for the oosyscall lcall instruction. */
 		if (p->p_emul == &emul_netbsd32 &&
 		    frame->tf_rip < VM_MAXUSER_ADDRESS32 - sz &&
 		    copyin((void *)frame->tf_rip, tmp, sz) == 0 &&
 		    memcmp(tmp, lcall, sz) == 0) {
 			/* Advance past the lcall. */
 			frame->tf_rip += sz;
 			/* Do the syscall. */
 			p->p_md.md_syscall(frame);
 			goto out;
+	}
 #endif
 		/* FALLTHROUGH */
 	case T_TSSFLT|T_USER:
 	case T_SEGNPFLT|T_USER:
 	case T_STKFLT|T_USER:
 	case T_ALIGNFLT|T_USER:
 		KSI_INIT_TRAP(&ksi);
 		ksi.ksi_trap = type & ~T_USER;
 		ksi.ksi_addr = (void *)frame->tf_rip;
 		switch (type) {
 		case T_SEGNPFLT|T_USER:
 		case T_STKFLT|T_USER:
 			ksi.ksi_signo = SIGBUS;
 			ksi.ksi_code = BUS_ADRERR;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_mod.c,v 1.16 2019/11/20 19:37:53 pgoyette Exp $	*/
+/*	$NetBSD: netbsd32_mod.c,v 1.17 2020/03/08 00:53:12 pgoyette Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software developed for The NetBSD Foundation
  * by Andrew Doran.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer.
 @@ -19,42 +19,72 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Copyright (c) 1998, 2000, 2017 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum, and by Maxime Villard.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.16 2019/11/20 19:37:53 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.17 2020/03/08 00:53:12 pgoyette Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_execfmt.h"
 #endif
 #ifndef ELFSIZE
 #define ELFSIZE ARCH_ELFSIZE
 #endif
 #include <sys/param.h>
 #include <sys/module.h>
 #include <sys/exec.h>
 #include <sys/exec_elf.h>
 #include <sys/module_hook.h>
 #include <sys/compat_stub.h>
 #include <compat/netbsd32/netbsd32_sysctl.h>
 #include <compat/netbsd32/netbsd32_kern_proc.h>
 #include <compat/netbsd32/netbsd32_exec.h>
 #define ELF32_AUXSIZE (howmany(ELF_AUX_ENTRIES * sizeof(Aux32Info), \
     sizeof(Elf32_Addr)) + MAXPATHLEN + ALIGN(1))
 struct compat32_80_modctl_hook_t compat32_80_modctl_hook;
 # define	DEPS1	"ksem,compat_util"
 #if defined(EXEC_ELF32)
 @@ -90,47 +120,86 @@ static struct execsw netbsd32_execsw[] =
 			.elf_probe_func = netbsd32_elf32_probe,
 		},
 		.es_emul = &emul_netbsd32,
 		.es_prio = EXECSW_PRIO_ANY,
 		.es_arglen = ELF32_AUXSIZE,
 		.es_copyargs = netbsd32_elf32_copyargs,
 		.es_setregs = NULL,
 		.es_coredump = coredump_elf32,
 		.es_setup_stack = exec_setup_stack,
 	},
 #endif
 };
 #if defined(__amd64__)
 /* This code was moved here, from $SRC/arch/amd64/amd64/trap.c */
 static int
 amd64_oosyscall_handle(struct proc *p, struct trapframe *frame)
+{
 	static const char lcall[7] = { 0x9a, 0, 0, 0, 0, 7, 0 };
 	const size_t sz = sizeof(lcall);
 	char tmp[sizeof(lcall) /* Avoids VLA */];
 	/* Check for the oosyscall lcall instruction. */
 	if (p->p_emul == &emul_netbsd32 &&
 	    frame->tf_rip < VM_MAXUSER_ADDRESS32 - sz &&
 	    copyin((void *)frame->tf_rip, tmp, sz) == 0 &&
 	    memcmp(tmp, lcall, sz) == 0) {
 		/* Advance past the lcall. */
 		frame->tf_rip += sz;
 		/* Do the syscall */
 		p->p_md.md_syscall(frame);
 		return 0;
 	} else
 		return EPASSTHROUGH;
+}
 #endif
 static int
 compat_netbsd32_modcmd(modcmd_t cmd, void *arg)
+{
 	int error;
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 		error = exec_add(netbsd32_execsw,
 		    __arraycount(netbsd32_execsw));
 		if (error == 0) {
 			netbsd32_sysctl_init();
 			netbsd32_machdep_md_init();
 			netbsd32_kern_proc_32_init();
 #if defined(__amd64__)
 		MODULE_HOOK_SET(amd64_oosyscall_hook, amd64_oosyscall_handle);
 #endif
+		}
 		return error;
 	case MODULE_CMD_FINI:
 #if defined(__amd64__)
 		MODULE_HOOK_UNSET(amd64_oosyscall_hook);
 #endif
 		netbsd32_machdep_md_fini();
 		netbsd32_sysctl_fini();
 		netbsd32_kern_proc_32_fini();
 		error = exec_remove(netbsd32_execsw,
 		    __arraycount(netbsd32_execsw));
 		if (error) {
 			netbsd32_kern_proc_32_init();
 			netbsd32_sysctl_init();
 			netbsd32_machdep_md_init();
 #if defined(__amd64__)
 			MODULE_HOOK_SET(amd64_oosyscall_hook,
 			    amd64_oosyscall_handle);
 #endif
+		}
 		return error;
 	default:
 		return ENOTTY;
+	}
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: compat_stub.h,v 1.22 2019/11/20 19:37:54 pgoyette Exp $	*/
+/*	$NetBSD: compat_stub.h,v 1.23 2020/03/08 00:53:13 pgoyette Exp $	*/
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Goyette
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer.
 @@ -371,14 +371,21 @@ MODULE_HOOK(sendsig_sigcontext_16_hook,
  */
 struct uvm_coredump_state;
 MODULE_HOOK(coredump_hook, int, (struct lwp *, const char *));
 MODULE_HOOK(coredump_offset_hook, off_t, (struct coredump_iostate *));
 MODULE_HOOK(coredump_write_hook, int,
     (struct coredump_iostate *, enum uio_seg, const void *, size_t));
 MODULE_HOOK(coredump_netbsd_hook, int,
     (struct lwp *, struct coredump_iostate *));
 MODULE_HOOK(uvm_coredump_walkmap_hook, int,
     (struct proc *, int (*)(struct uvm_coredump_state *), void *));
 MODULE_HOOK(uvm_coredump_count_segs_hook, int, (struct proc *));
 /*
  * Hook for amd64 handler for oosyscall for COMPAT_NETBSD32 && COMPAT_10)
  */
 struct proc;
 struct trapframe;
 MODULE_HOOK(amd64_oosyscall_hook, int, (struct proc *, struct trapframe *));
 #endif	/* _SYS_COMPAT_STUB_H */