 @@ -1,487 +1,516 @@
-/*	$NetBSD: svr4_signal.c,v 1.65 2011/02/03 21:45:31 joerg Exp $	 */
+/*	$NetBSD: svr4_signal.c,v 1.65.24.1 2017/08/19 03:40:48 snj Exp $	 */
 /*-
  * Copyright (c) 1994, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas and by Charles M. Hannum.
+ *
  * 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: svr4_signal.c,v 1.65 2011/02/03 21:45:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_signal.c,v 1.65.24.1 2017/08/19 03:40:48 snj Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 #include <sys/malloc.h>
 #include <sys/wait.h>
 #include <sys/syscallargs.h>
 #include <uvm/uvm_extern.h>
 #include <compat/svr4/svr4_types.h>
 #include <compat/svr4/svr4_signal.h>
 #include <compat/svr4/svr4_lwp.h>
 #include <compat/svr4/svr4_ucontext.h>
 #include <compat/svr4/svr4_syscallargs.h>
 #include <compat/svr4/svr4_util.h>
 #include <compat/common/compat_sigaltstack.h>
 #define	svr4_sigmask(n)		(1 << (((n) - 1) & 31))
 #define	svr4_sigword(n)		(((n) - 1) >> 5)
 #define svr4_sigemptyset(s)	memset((s), 0, sizeof(*(s)))
 #define	svr4_sigismember(s, n)	((s)->bits[svr4_sigword(n)] & svr4_sigmask(n))
 #define	svr4_sigaddset(s, n)	((s)->bits[svr4_sigword(n)] |= svr4_sigmask(n))
 static inline void svr4_sigfillset(svr4_sigset_t *);
 void svr4_to_native_sigaction(const struct svr4_sigaction *,
 				struct sigaction *);
 void native_to_svr4_sigaction(const struct sigaction *,
 				struct svr4_sigaction *);
 extern const int native_to_svr4_signo[];
 extern const int svr4_to_native_signo[];
 static int
 svr4_decode_signum(int signum, int *native_signo, int *sigcall)
+{
 	if (SVR4_SIGNO(signum) >= SVR4_NSIG)
 		return EINVAL;
 	if (native_signo)
 		*native_signo = svr4_to_native_signo[SVR4_SIGNO(signum)];
 	if (sigcall)
 		*sigcall = SVR4_SIGCALL(signum);
 	return 0;
+}
 static inline void
 svr4_sigfillset(svr4_sigset_t *s)
+{
 	int i;
 	svr4_sigemptyset(s);
 	for (i = 1; i < SVR4_NSIG; i++)
 		if (svr4_to_native_signo[i] != 0)
 			svr4_sigaddset(s, i);
+}
 void
 svr4_to_native_sigset(const svr4_sigset_t *sss, sigset_t *bss)
+{
 	int i, newsig;
 	sigemptyset(bss);
 	for (i = 1; i < SVR4_NSIG; i++) {
 		if (svr4_sigismember(sss, i)) {
 			newsig = svr4_to_native_signo[i];
 			if (newsig)
 				sigaddset(bss, newsig);
+		}
+	}
+}
 void
 native_to_svr4_sigset(const sigset_t *bss, svr4_sigset_t *sss)
+{
 	int i, newsig;
 	svr4_sigemptyset(sss);
 	for (i = 1; i < NSIG; i++) {
 		if (sigismember(bss, i)) {
 			newsig = native_to_svr4_signo[i];
 			if (newsig)
 				svr4_sigaddset(sss, newsig);
+		}
+	}
+}
 /*
  * XXX: Only a subset of the flags is currently implemented.
  */
 void
 svr4_to_native_sigaction(const struct svr4_sigaction *ssa, struct sigaction *bsa)
+{
 	bsa->sa_handler = (sig_t) ssa->svr4_sa_handler;
 	svr4_to_native_sigset(&ssa->svr4_sa_mask, &bsa->sa_mask);
 	bsa->sa_flags = 0;
 	if ((ssa->svr4_sa_flags & SVR4_SA_ONSTACK) != 0)
 		bsa->sa_flags |= SA_ONSTACK;
 	if ((ssa->svr4_sa_flags & SVR4_SA_RESETHAND) != 0)
 		bsa->sa_flags |= SA_RESETHAND;
 	if ((ssa->svr4_sa_flags & SVR4_SA_RESTART) != 0)
 		bsa->sa_flags |= SA_RESTART;
 	if ((ssa->svr4_sa_flags & SVR4_SA_SIGINFO) != 0)
 		bsa->sa_flags |= SA_SIGINFO;
 	if ((ssa->svr4_sa_flags & SVR4_SA_NODEFER) != 0)
 		bsa->sa_flags |= SA_NODEFER;
 	if ((ssa->svr4_sa_flags & SVR4_SA_NOCLDWAIT) != 0)
 		bsa->sa_flags |= SA_NOCLDWAIT;
 	if ((ssa->svr4_sa_flags & SVR4_SA_NOCLDSTOP) != 0)
 		bsa->sa_flags |= SA_NOCLDSTOP;
 	if ((ssa->svr4_sa_flags & ~SVR4_SA_ALLBITS) != 0) {
 		DPRINTF(("svr4_to_native_sigaction: extra bits %x ignored\n",
 		    ssa->svr4_sa_flags & ~SVR4_SA_ALLBITS));
+	}
+}
 void
 native_to_svr4_sigaction(const struct sigaction *bsa, struct svr4_sigaction *ssa)
+{
 	ssa->svr4_sa_handler = (svr4_sig_t) bsa->sa_handler;
 	native_to_svr4_sigset(&bsa->sa_mask, &ssa->svr4_sa_mask);
 	ssa->svr4_sa_flags = 0;
 	if ((bsa->sa_flags & SA_ONSTACK) != 0)
 		ssa->svr4_sa_flags |= SVR4_SA_ONSTACK;
 	if ((bsa->sa_flags & SA_RESETHAND) != 0)
 		ssa->svr4_sa_flags |= SVR4_SA_RESETHAND;
 	if ((bsa->sa_flags & SA_RESTART) != 0)
 		ssa->svr4_sa_flags |= SVR4_SA_RESTART;
 	if ((bsa->sa_flags & SA_NODEFER) != 0)
 		ssa->svr4_sa_flags |= SVR4_SA_NODEFER;
 	if ((bsa->sa_flags & SA_NOCLDSTOP) != 0)
 		ssa->svr4_sa_flags |= SVR4_SA_NOCLDSTOP;
+}
 int
 svr4_sys_sigaction(struct lwp *l, const struct svr4_sys_sigaction_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) signum;
 		syscallarg(const struct svr4_sigaction *) nsa;
 		syscallarg(struct svr4_sigaction *) osa;
 	} */
 	struct svr4_sigaction nssa, ossa;
 	struct sigaction nbsa, obsa;
 	int native_signo;
 	int error;
 	if (SCARG(uap, nsa)) {
 		error = copyin(SCARG(uap, nsa), &nssa, sizeof(nssa));
 		if (error)
 			return (error);
 		svr4_to_native_sigaction(&nssa, &nbsa);
+	}
 	error = sigaction1(l, svr4_to_native_signo[SVR4_SIGNO(SCARG(uap, signum))],
 	error = svr4_decode_signum(SCARG(uap, signum), &native_signo, NULL);
 	if (error)
 		return error;
 	error = sigaction1(l, native_signo,
 	    SCARG(uap, nsa) ? &nbsa : 0, SCARG(uap, osa) ? &obsa : 0,
 	    NULL, 0);
 	if (error)
 		return (error);
 	if (SCARG(uap, osa)) {
 		native_to_svr4_sigaction(&obsa, &ossa);
 		error = copyout(&ossa, SCARG(uap, osa), sizeof(ossa));
 		if (error)
 			return (error);
+	}
 	return (0);
+}
 int
 svr4_sys_sigaltstack(struct lwp *l, const struct svr4_sys_sigaltstack_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const struct svr4_sigaltstack *) nss;
 		syscallarg(struct svr4_sigaltstack *) oss;
 	} */
 	compat_sigaltstack(uap, svr4_sigaltstack,
 	    SVR4_SS_ONSTACK, SVR4_SS_DISABLE);
+}
 /*
  * Stolen from the ibcs2 one
  */
 int
 svr4_sys_signal(struct lwp *l, const struct svr4_sys_signal_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) signum;
 		syscallarg(svr4_sig_t) handler;
 	} */
-	int signum = svr4_to_native_signo[SVR4_SIGNO(SCARG(uap, signum))];
+	int native_signo, sigcall;
 	struct proc *p = l->l_proc;
 	struct sigaction nbsa, obsa;
 	sigset_t ss;
 	int error;
-	if (signum <= 0 || signum >= SVR4_NSIG)
+	error = svr4_decode_signum(SCARG(uap, signum), &native_signo,
-		return (EINVAL);
+	    &sigcall);
 	if (error)
 		return error;
-	switch (SVR4_SIGCALL(SCARG(uap, signum))) {
+	switch (sigcall) {
 	case SVR4_SIGDEFER_MASK:
 		if (SCARG(uap, handler) == SVR4_SIG_HOLD)
 			goto sighold;
 		/* FALLTHROUGH */
 	case SVR4_SIGNAL_MASK:
 		nbsa.sa_handler = (sig_t)SCARG(uap, handler);
 		sigemptyset(&nbsa.sa_mask);
 		nbsa.sa_flags = 0;
-		error = sigaction1(l, signum, &nbsa, &obsa, NULL, 0);
+		error = sigaction1(l, native_signo, &nbsa, &obsa, NULL, 0);
 		if (error)
 			return (error);
 		*retval = (u_int)(u_long)obsa.sa_handler;
 		return (0);
 	case SVR4_SIGHOLD_MASK:
 	sighold:
 		sigemptyset(&ss);
-		sigaddset(&ss, signum);
+		sigaddset(&ss, native_signo);
 		mutex_enter(p->p_lock);
 		error = sigprocmask1(l, SIG_BLOCK, &ss, 0);
 		mutex_exit(p->p_lock);
 		return error;
 	case SVR4_SIGRELSE_MASK:
 		sigemptyset(&ss);
-		sigaddset(&ss, signum);
+		sigaddset(&ss, native_signo);
 		mutex_enter(p->p_lock);
 		error = sigprocmask1(l, SIG_UNBLOCK, &ss, 0);
 		mutex_exit(p->p_lock);
 		return error;
 	case SVR4_SIGIGNORE_MASK:
 		nbsa.sa_handler = SIG_IGN;
 		sigemptyset(&nbsa.sa_mask);
 		nbsa.sa_flags = 0;
-		return (sigaction1(l, signum, &nbsa, 0, NULL, 0));
+		return (sigaction1(l, native_signo, &nbsa, 0, NULL, 0));
 	case SVR4_SIGPAUSE_MASK:
 		ss = l->l_sigmask;	/* XXXAD locking */
-		sigdelset(&ss, signum);
+		sigdelset(&ss, native_signo);
 		return (sigsuspend1(l, &ss));
 	default:
 		return (ENOSYS);
+	}
+}
 int
 svr4_sys_sigprocmask(struct lwp *l, const struct svr4_sys_sigprocmask_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) how;
 		syscallarg(const svr4_sigset_t *) set;
 		syscallarg(svr4_sigset_t *) oset;
 	} */
 	struct proc *p = l->l_proc;
 	svr4_sigset_t nsss, osss;
 	sigset_t nbss, obss;
 	int how;
 	int error;
 	/*
 	 * Initialize how to 0 to avoid a compiler warning.  Note that
 	 * this is safe because of the check in the default: case.
 	 */
 	how = 0;
 	switch (SCARG(uap, how)) {
 	case SVR4_SIG_BLOCK:
 		how = SIG_BLOCK;
 		break;
 	case SVR4_SIG_UNBLOCK:
 		how = SIG_UNBLOCK;
 		break;
 	case SVR4_SIG_SETMASK:
 		how = SIG_SETMASK;
 		break;
 	default:
 		if (SCARG(uap, set))
 			return EINVAL;
 		break;
+	}
 	if (SCARG(uap, set)) {
 		error = copyin(SCARG(uap, set), &nsss, sizeof(nsss));
 		if (error)
 			return error;
 		svr4_to_native_sigset(&nsss, &nbss);
+	}
 	mutex_enter(p->p_lock);
 	error = sigprocmask1(l, how,
 	    SCARG(uap, set) ? &nbss : NULL, SCARG(uap, oset) ? &obss : NULL);
 	mutex_exit(p->p_lock);
 	if (error)
 		return error;
 	if (SCARG(uap, oset)) {
 		native_to_svr4_sigset(&obss, &osss);
 		error = copyout(&osss, SCARG(uap, oset), sizeof(osss));
 		if (error)
 			return error;
+	}
 	return 0;
+}
 int
 svr4_sys_sigpending(struct lwp *l, const struct svr4_sys_sigpending_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) what;
 		syscallarg(svr4_sigset_t *) set;
 	} */
 	sigset_t bss;
 	svr4_sigset_t sss;
 	switch (SCARG(uap, what)) {
 	case 1:	/* sigpending */
 		sigpending1(l, &bss);
 		native_to_svr4_sigset(&bss, &sss);
 		break;
 	case 2:	/* sigfillset */
 		svr4_sigfillset(&sss);
 		break;
 	default:
 		return (EINVAL);
+	}
 	return (copyout(&sss, SCARG(uap, set), sizeof(sss)));
+}
 int
 svr4_sys_sigsuspend(struct lwp *l, const struct svr4_sys_sigsuspend_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const svr4_sigset_t *) set;
 	} */
 	svr4_sigset_t sss;
 	sigset_t bss;
 	int error;
 	if (SCARG(uap, set)) {
 		error = copyin(SCARG(uap, set), &sss, sizeof(sss));
 		if (error)
 			return (error);
 		svr4_to_native_sigset(&sss, &bss);
+	}
 	return (sigsuspend1(l, SCARG(uap, set) ? &bss : 0));
+}
 int
 svr4_sys_pause(struct lwp *l, const void *v, register_t *retval)
+{
 	return (sigsuspend1(l, 0));
+}
 int
 svr4_sys_kill(struct lwp *l, const struct svr4_sys_kill_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) pid;
 		syscallarg(int) signum;
 	} */
 	struct sys_kill_args ka;
 	int native_signo;
 	int error;
 	error = svr4_decode_signum(SCARG(uap, signum), &native_signo, NULL);
 	if (error)
 		return error;
 	SCARG(&ka, pid) = SCARG(uap, pid);
-	SCARG(&ka, signum) = svr4_to_native_signo[SVR4_SIGNO(SCARG(uap, signum))];
+	SCARG(&ka, signum) = native_signo;
 	return sys_kill(l, &ka, retval);
+}
 void
 svr4_getcontext(struct lwp *l, struct svr4_ucontext *uc)
+{
 	sigset_t mask;
 	struct proc *p = l->l_proc;
 	svr4_getmcontext(l, &uc->uc_mcontext, &uc->uc_flags);
 	uc->uc_link = l->l_ctxlink;
 	/*
 	 * The (unsupplied) definition of the `current execution stack'
 	 * in the System V Interface Definition appears to allow returning
 	 * the main context stack.
 	 */
 	if ((l->l_sigstk.ss_flags & SS_ONSTACK) == 0) {
 		uc->uc_stack.ss_sp = (void *)USRSTACK;
 		uc->uc_stack.ss_size = ctob(p->p_vmspace->vm_ssize);
 		uc->uc_stack.ss_flags = 0;	/* XXX, def. is Very Fishy */
 	} else {
 		/* Simply copy alternate signal execution stack. */
 		uc->uc_stack.ss_sp = l->l_sigstk.ss_sp;
 		uc->uc_stack.ss_size = l->l_sigstk.ss_size;
 		uc->uc_stack.ss_flags = l->l_sigstk.ss_flags;
+	}
 	(void)sigprocmask1(l, 0, NULL, &mask);
 	native_to_svr4_sigset(&mask, &uc->uc_sigmask);
 	uc->uc_flags |= _UC_SIGMASK | _UC_STACK;
+}
 int
 svr4_setcontext(struct lwp *l, struct svr4_ucontext *uc)
+{
 	struct proc *p = l->l_proc;
 	sigset_t mask;
 	if (uc->uc_flags & _UC_SIGMASK) {
 		svr4_to_native_sigset(&uc->uc_sigmask, &mask);
 		mutex_enter(p->p_lock);
 		sigprocmask1(l, SIG_SETMASK, &mask, NULL);
 		mutex_exit(p->p_lock);
+	}
 	/* Ignore the stack; see comment in svr4_getcontext. */
 	l->l_ctxlink = uc->uc_link;
 	svr4_setmcontext(l, &uc->uc_mcontext, uc->uc_flags);
 	return EJUSTRETURN;
+}
 int
 svr4_sys_context(struct lwp *l, const struct svr4_sys_context_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) func;
 		syscallarg(struct svr4_ucontext *) uc;
 	} */
 	int error;
 	svr4_ucontext_t uc;
 	*retval = 0;
 	memset(&uc, 0, sizeof(uc));
 	switch (SCARG(uap, func)) {
 	case SVR4_GETCONTEXT:
 		DPRINTF(("getcontext(%p)\n", SCARG(uap, uc)));
 		svr4_getcontext(l, &uc);
 	return (copyout(&uc, SCARG(uap, uc), sizeof (*SCARG(uap, uc))));
 	case SVR4_SETCONTEXT:
 		DPRINTF(("setcontext(%p)\n", SCARG(uap, uc)));
 		error = copyin(SCARG(uap, uc), &uc, sizeof (uc));
 		if (error)
 			return (error);
 		svr4_setcontext(l, &uc);
 		return EJUSTRETURN;
 	default:
 		DPRINTF(("context(%d, %p)\n", SCARG(uap, func),
 		    SCARG(uap, uc)));
 		return ENOSYS;
+	}
+}

 @@ -1,1851 +1,1892 @@
-/*	$NetBSD: svr4_stream.c,v 1.79 2011/06/26 16:42:41 christos Exp $	 */
+/*	$NetBSD: svr4_stream.c,v 1.79.22.1 2017/08/19 03:40:48 snj Exp $	 */
 /*-
  * Copyright (c) 1994, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * 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.
  */
 /*
  * Pretend that we have streams...
  * Yes, this is gross.
+ *
  * ToDo: The state machine for getmsg needs re-thinking
+ *
  * The svr4_32 version is built from this file as well.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_stream.c,v 1.79 2011/06/26 16:42:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_stream.c,v 1.79.22.1 2017/08/19 03:40:48 snj Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/malloc.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/namei.h>
 #include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
 #include <sys/un.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <sys/mbuf.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/vfs_syscalls.h>
 #include <sys/vnode.h>
 #include <sys/device.h>
 #include <sys/stat.h>
 #include <sys/syscallargs.h>
 #ifndef SVR4_32
 #define	compat(name) <compat/svr4/svr4_##name>
 #else
 #define	compat(name) <compat/svr4_32/svr4_32_##name>
 #endif
 #include compat(types.h)
 #include compat(util.h)
 #include compat(signal.h)
 #include compat(lwp.h)
 #include compat(ucontext.h)
 #include compat(syscallargs.h)
 #include compat(stropts.h)
 #include compat(timod.h)
 #include <compat/svr4/svr4_sockmod.h>
 #include compat(ioctl.h)
 #include compat(socket.h)
 #undef compat
 #ifndef SVR4_32
 #define SCARG_PTR(uap, arg)	SCARG(uap, arg)
 #define NETBSD32PTR(ptr)	(ptr)
 #else
 #define SCARG_PTR(uap, arg)	SCARG_P32(uap, arg)
 #define NETBSD32PTR(ptr)	NETBSD32PTR64(ptr)
 /* Rename stuff that is different for the svr4_32 build */
 #define	svr4_infocmd		svr4_32_infocmd
 #define	svr4_ino_t		svr4_32_ino_t
 #define	svr4_netaddr_in		svr4_32_netaddr_in
 #define	svr4_netaddr_un		svr4_32_netaddr_un
 #define	svr4_strbuf		svr4_32_strbuf
 #define	svr4_stream_get		svr4_32_stream_get
 #define	svr4_stream_ioctl	svr4_32_stream_ioctl
 #define	svr4_stream_ti_ioctl	svr4_32_stream_ti_ioctl
 #define	svr4_strfdinsert	svr4_32_strfdinsert
 #define	svr4_strioctl		svr4_32_strioctl
 #define	svr4_strmcmd		svr4_32_strmcmd
 #define	svr4_sys_getmsg		svr4_32_sys_getmsg
 #define	svr4_sys_getmsg_args	svr4_32_sys_getmsg_args
 #define	svr4_sys_putmsg		svr4_32_sys_putmsg
 #define	svr4_sys_putmsg_args	svr4_32_sys_putmsg_args
 #endif /* SVR4_32 */
 /* Utils */
 static int clean_pipe(struct lwp *, const char *);
 static void getparm(file_t *, struct svr4_si_sockparms *);
 /* Address Conversions */
 static void sockaddr_to_netaddr_in(struct svr4_strmcmd *,
 					const struct sockaddr_in *);
 static void sockaddr_to_netaddr_un(struct svr4_strmcmd *,
 					const struct sockaddr_un *);
 static void netaddr_to_sockaddr_in(struct sockaddr_in *,
 					const struct svr4_strmcmd *);
 static void netaddr_to_sockaddr_un(struct sockaddr_un *,
 					const struct svr4_strmcmd *);
 /* stream ioctls */
 static int i_nread(file_t *, struct lwp *, register_t *, int,
     u_long, void *);
 static int i_fdinsert(file_t *, struct lwp *, register_t *, int,
     u_long, void *);
 static int i_str(file_t *, struct lwp *, register_t *, int,
     u_long, void *);
 static int i_setsig(file_t *, struct lwp *, register_t *, int,
     u_long, void *);
 static int i_getsig(file_t *, struct lwp *, register_t *, int,
     u_long, void *);
 static int _i_bind_rsvd(file_t *, struct lwp *, register_t *, int,
     u_long, void *);
 static int _i_rele_rsvd(file_t *, struct lwp *, register_t *, int,
     u_long, void *);
 /* i_str sockmod calls */
 static int sockmod(file_t *, int, struct svr4_strioctl *,
 			      struct lwp *);
 static int si_listen(file_t *, int, struct svr4_strioctl *,
 			      struct lwp *);
 static int si_ogetudata(file_t *, int, struct svr4_strioctl *,
 			      struct lwp *);
 static int si_sockparams(file_t *, int, struct svr4_strioctl *,
 			      struct lwp *);
 static int si_shutdown(file_t *, int, struct svr4_strioctl *,
 			      struct lwp *);
 static int si_getudata(file_t *, int, struct svr4_strioctl *,
 			      struct lwp *);
 /* i_str timod calls */
 static int timod(file_t *, int, struct svr4_strioctl *,
 		              struct lwp *);
 static int ti_getinfo(file_t *, int, struct svr4_strioctl *,
 			      struct lwp *);
 static int ti_bind(file_t *, int, struct svr4_strioctl *,
 			      struct lwp *);
 #ifdef DEBUG_SVR4
 static void bufprint(u_char *, size_t);
 static int show_ioc(const char *, struct svr4_strioctl *);
 static int show_strbuf(struct svr4_strbuf *);
 static void show_msg(const char *, int, struct svr4_strbuf *,
 			  struct svr4_strbuf *, int);
 static void
 bufprint(u_char *buf, size_t len)
+{
 	size_t i;
 	uprintf("\n\t");
 	for (i = 0; i < len; i++) {
 		uprintf("%x ", buf[i]);
 		if (i && (i % 16) == 0)
 			uprintf("\n\t");
+	}
+}
 static int
 show_ioc(const char *str, struct svr4_strioctl *ioc)
+{
 	u_char *ptr;
 	int error, len;
 	len = ioc->len;
 	if (len > 1024)
 		len = 1024;
 	ptr = (u_char *) malloc(len, M_TEMP, M_WAITOK);
 	uprintf("%s cmd = %ld, timeout = %d, len = %d, buf = %p { ",
 	    str, ioc->cmd, ioc->timeout, ioc->len, ioc->buf);
 	if ((error = copyin(ioc->buf, ptr, len)) != 0) {
 		free((char *) ptr, M_TEMP);
 		return error;
+	}
 	bufprint(ptr, len);
 	uprintf("}\n");
 	free((char *) ptr, M_TEMP);
 	return 0;
+}
 static int
 show_strbuf(struct svr4_strbuf *str)
+{
 	int error;
 	u_char *ptr = NULL;
 	int maxlen = str->maxlen;
 	int len = str->len;
 	if (maxlen > 8192)
 		maxlen = 8192;
 	if (maxlen < 0)
 		maxlen = 0;
 	if (len >= maxlen)
 		len = maxlen;
 	if (len > 0) {
 	    ptr = (u_char *) malloc(len, M_TEMP, M_WAITOK);
 	    if ((error = copyin(str->buf, ptr, len)) != 0) {
 		    free((char *) ptr, M_TEMP);
 		    return error;
+	    }
+	}
 	uprintf(", { %d, %d, %p=[ ", str->maxlen, str->len, str->buf);
 	if (ptr)
 		bufprint(ptr, len);
 	uprintf("]}");
 	if (ptr)
 		free((char *) ptr, M_TEMP);
 	return 0;
+}
 static void
 show_msg(const char *str, int fd, struct svr4_strbuf *ctl, struct svr4_strbuf *dat, int flags)
+{
 	struct svr4_strbuf	buf;
 	int error;
 	uprintf("%s(%d", str, fd);
 	if (ctl != NULL) {
 		if ((error = copyin(ctl, &buf, sizeof(buf))) != 0)
 			return;
 		show_strbuf(&buf);
+	}
 	else
 		uprintf(", NULL");
 	if (dat != NULL) {
 		if ((error = copyin(dat, &buf, sizeof(buf))) != 0)
 			return;
 		show_strbuf(&buf);
+	}
 	else
 		uprintf(", NULL");
 	uprintf(", %x);\n", flags);
+}
 #endif /* DEBUG_SVR4 */
 /*
  * We are faced with an interesting situation. On svr4 unix sockets
  * are really pipes. But we really have sockets, and we might as
  * well use them. At the point where svr4 calls TI_BIND, it has
  * already created a named pipe for the socket using mknod(2).
  * We need to create a socket with the same name when we bind,
  * so we need to remove the pipe before, otherwise we'll get address
  * already in use. So we *carefully* remove the pipe, to avoid
  * using this as a random file removal tool.
  */
 static int
 clean_pipe(struct lwp *l, const char *path)
+{
 	struct pathbuf *pb;
 	struct nameidata nd;
 	struct vattr va;
 	int error;
 	pb = pathbuf_create(path);
 	if (pb == NULL) {
 		return ENOMEM;
+	}
 	NDINIT(&nd, DELETE, NOFOLLOW | LOCKPARENT | LOCKLEAF | TRYEMULROOT, pb);
 	error = namei(&nd);
 	if (error != 0) {
 		pathbuf_destroy(pb);
 		return error;
+	}
 	/*
 	 * Make sure we are dealing with a mode 0 named pipe.
 	 */
 	if (nd.ni_vp->v_type != VFIFO)
 		goto bad;
         error = VOP_GETATTR(nd.ni_vp, &va, l->l_cred);
 	if (error != 0)
 		goto bad;
 	if ((va.va_mode & ALLPERMS) != 0)
 		goto bad;
 	error = VOP_REMOVE(nd.ni_dvp, nd.ni_vp, &nd.ni_cnd);
 	pathbuf_destroy(pb);
 	return error;
     bad:
 	if (nd.ni_dvp == nd.ni_vp)
 		vrele(nd.ni_dvp);
 	else
 		vput(nd.ni_dvp);
 	vput(nd.ni_vp);
 	pathbuf_destroy(pb);
 	return error;
+}
 static void
 sockaddr_to_netaddr_in(struct svr4_strmcmd *sc, const struct sockaddr_in *sain)
+{
 	struct svr4_netaddr_in *na;
 	na = SVR4_ADDROF(sc);
 	na->family = sain->sin_family;
 	na->port = sain->sin_port;
 	na->addr = sain->sin_addr.s_addr;
 	DPRINTF(("sockaddr_in -> netaddr %d %d %lx\n", na->family, na->port,
 		 na->addr));
+}
 static void
 sockaddr_to_netaddr_un(struct svr4_strmcmd *sc, const struct sockaddr_un *saun)
+{
 	struct svr4_netaddr_un *na;
 	char *dst, *edst = ((char *) sc) + sc->offs + sizeof(na->family) + 1  -
 	    sizeof(*sc);
 	const char *src;
 	na = SVR4_ADDROF(sc);
 	na->family = saun->sun_family;
 	for (src = saun->sun_path, dst = na->path; (*dst++ = *src++) != '\0'; )
 		if (dst == edst)
 			break;
 	DPRINTF(("sockaddr_un -> netaddr %d %s\n", na->family, na->path));
+}
 static void
 netaddr_to_sockaddr_in(struct sockaddr_in *sain, const struct svr4_strmcmd *sc)
+{
 	const struct svr4_netaddr_in *na;
 	na = SVR4_C_ADDROF(sc);
 	memset(sain, 0, sizeof(*sain));
 	sain->sin_len = sizeof(*sain);
 	sain->sin_family = na->family;
 	sain->sin_port = na->port;
 	sain->sin_addr.s_addr = na->addr;
 	DPRINTF(("netaddr -> sockaddr_in %d %d %x\n", sain->sin_family,
 		 sain->sin_port, sain->sin_addr.s_addr));
+}
 static void
 netaddr_to_sockaddr_un(struct sockaddr_un *saun, const struct svr4_strmcmd *sc)
+{
 	const struct svr4_netaddr_un *na;
 	char *dst, *edst = &saun->sun_path[sizeof(saun->sun_path) - 1];
 	const char *src;
 	na = SVR4_C_ADDROF(sc);
 	memset(saun, 0, sizeof(*saun));
 	saun->sun_family = na->family;
 	for (src = na->path, dst = saun->sun_path; (*dst++ = *src++) != '\0'; )
 		if (dst == edst)
 			break;
 	saun->sun_len = dst - saun->sun_path;
 	DPRINTF(("netaddr -> sockaddr_un %d %s\n", saun->sun_family,
 		 saun->sun_path));
+}
 static void
 getparm(file_t *fp, struct svr4_si_sockparms *pa)
+{
 	struct svr4_strm *st = svr4_stream_get(fp);
 	struct socket *so = (struct socket *) fp->f_data;
 	if (st == NULL)
 		return;
 	pa->family = st->s_family;
 	switch (so->so_type) {
 	case SOCK_DGRAM:
 		pa->type = SVR4_T_CLTS;
 		pa->protocol = IPPROTO_UDP;
 		DPRINTF(("getparm(dgram)\n"));
 		return;
 	case SOCK_STREAM:
 	        pa->type = SVR4_T_COTS;  /* What about T_COTS_ORD? XXX */
 		pa->protocol = IPPROTO_IP;
 		DPRINTF(("getparm(stream)\n"));
 		return;
 	case SOCK_RAW:
 		pa->type = SVR4_T_CLTS;
 		pa->protocol = IPPROTO_RAW;
 		DPRINTF(("getparm(raw)\n"));
 		return;
 	default:
 		pa->type = 0;
 		pa->protocol = 0;
 		DPRINTF(("getparm(type %d?)\n", so->so_type));
 		return;
+	}
+}
 static int
 si_ogetudata(file_t *fp, int fd, struct svr4_strioctl *ioc,
     struct lwp *l)
+{
 	int error;
 	struct svr4_si_oudata ud;
 	struct svr4_si_sockparms pa;
 	(void)memset(&pa, 0, sizeof(pa));	/* XXX: GCC */
 	if (ioc->len != sizeof(ud) && ioc->len != sizeof(ud) - sizeof(int)) {
 		DPRINTF(("SI_OGETUDATA: Wrong size %ld != %d\n",
 		    (unsigned long)sizeof(ud), ioc->len));
 		return EINVAL;
+	}
 	if ((error = copyin(NETBSD32PTR(ioc->buf), &ud, sizeof(ud))) != 0)
 		return error;
 	getparm(fp, &pa);
 	switch (pa.family) {
 	case AF_INET:
 	    ud.tidusize = 16384;
 	    ud.addrsize = sizeof(struct sockaddr_in);
 	    if (pa.type == SVR4_SOCK_STREAM)
 		    ud.etsdusize = 1;
 	    else
 		    ud.etsdusize = 0;
 	    break;
 	case AF_LOCAL:
 	    ud.tidusize = 65536;
 	    ud.addrsize = 128;
 	    ud.etsdusize = 128;
 	    break;
 	default:
 	    DPRINTF(("SI_OGETUDATA: Unsupported address family %d\n",
 		     pa.family));
 	    return ENOSYS;
+	}
 	/* I have no idea what these should be! */
 	ud.optsize = 128;
 	ud.tsdusize = 128;
 	ud.servtype = pa.type;
 	/* XXX: Fixme */
 	ud.so_state = 0;
 	ud.so_options = 0;
 	return copyout(&ud, NETBSD32PTR(ioc->buf), ioc->len);
+}
 static int
 si_sockparams(file_t *fp, int fd, struct svr4_strioctl *ioc,
     struct lwp *l)
+{
 	struct svr4_si_sockparms pa;
 	getparm(fp, &pa);
 	return copyout(&pa, NETBSD32PTR(ioc->buf), sizeof(pa));
+}
 static int
 si_listen(file_t *fp, int fd, struct svr4_strioctl *ioc, struct lwp *l)
+{
 	int error;
 	struct svr4_strm *st = svr4_stream_get(fp);
 	register_t retval;
 	struct svr4_strmcmd lst;
 	struct sys_listen_args la;
 	if (st == NULL)
 		return EINVAL;
-	if (ioc->len > sizeof(lst))
+	if (ioc->len < offsetof(struct svr4_strmcmd, pad) ||
 	    ioc->len > sizeof(lst))
 		return EINVAL;
 	if ((error = copyin(NETBSD32PTR(ioc->buf), &lst, ioc->len)) != 0)
 		return error;
 	if (lst.offs < 0 ||
 	    lst.len < 0 ||
 	    lst.len > ioc->len ||
 	    ioc->len - lst.len < lst.offs)
 		return EINVAL;
 	if (lst.cmd != SVR4_TI_OLD_BIND_REQUEST) {
 		DPRINTF(("si_listen: bad request %ld\n", lst.cmd));
 		return EINVAL;
+	}
 	/*
 	 * We are making assumptions again...
 	 */
 	SCARG(&la, s) = fd;
 	DPRINTF(("SI_LISTEN: fileno %d backlog = %d\n", fd, 5));
 	SCARG(&la, backlog) = 5;
 	if ((error = sys_listen(l, &la, &retval)) != 0) {
 		DPRINTF(("SI_LISTEN: listen failed %d\n", error));
 		return error;
+	}
 	st->s_cmd = SVR4_TI__ACCEPT_WAIT;
 	lst.cmd = SVR4_TI_BIND_REPLY;
 	switch (st->s_family) {
 	case AF_INET:
 		/* XXX: Fill the length here */
 		break;
 	case AF_LOCAL:
 		lst.len = 140;
 		lst.pad[28] = 0x00000000;	/* magic again */
 		lst.pad[29] = 0x00000800;	/* magic again */
 		lst.pad[30] = 0x80001400;	/* magic again */
 		break;
 	default:
 		DPRINTF(("SI_LISTEN: Unsupported address family %d\n",
 		    st->s_family));
 		return ENOSYS;
+	}
 	if ((error = copyout(&lst, NETBSD32PTR(ioc->buf), ioc->len)) != 0)
 		return error;
 	return 0;
+}
 static int
 si_getudata(file_t *fp, int fd, struct svr4_strioctl *ioc,
     struct lwp *l)
+{
 	int error;
 	struct svr4_si_udata ud;
 	if (sizeof(ud) != ioc->len) {
 		DPRINTF(("SI_GETUDATA: Wrong size %ld != %d\n",
 		    (unsigned long)sizeof(ud), ioc->len));
 		return EINVAL;
+	}
 	if ((error = copyin(NETBSD32PTR(ioc->buf), &ud, sizeof(ud))) != 0)
 		return error;
 	getparm(fp, &ud.sockparms);
 	switch (ud.sockparms.family) {
 	case AF_INET:
 	    ud.tidusize = 16384;
 	    ud.tsdusize = 16384;
 	    ud.addrsize = sizeof(struct sockaddr_in);
 	    if (ud.sockparms.type == SVR4_SOCK_STREAM)
 		    ud.etsdusize = 1;
 	    else
 		    ud.etsdusize = 0;
 	    ud.optsize = 0;
 	    break;
 	case AF_LOCAL:
 	    ud.tidusize = 65536;
 	    ud.tsdusize = 128;
 	    ud.addrsize = 128;
 	    ud.etsdusize = 128;
 	    ud.optsize = 128;
 	    break;
 	default:
 	    DPRINTF(("SI_GETUDATA: Unsupported address family %d\n",
 		     ud.sockparms.family));
 	    return ENOSYS;
+	}
 	ud.servtype = ud.sockparms.type;
 	/* XXX: Fixme */
 	ud.so_state = 0;
 	ud.so_options = 0;
 	return copyout(&ud, NETBSD32PTR(ioc->buf), sizeof(ud));
+}
 static int
 si_shutdown(file_t *fp, int fd, struct svr4_strioctl *ioc,
     struct lwp *l)
+{
 	int error;
 	struct sys_shutdown_args ap;
 	register_t retval;
 	if (ioc->len != sizeof(SCARG(&ap, how))) {
 		DPRINTF(("SI_SHUTDOWN: Wrong size %ld != %d\n",
 		    (unsigned long)sizeof(SCARG(&ap, how)), ioc->len));
 		return EINVAL;
+	}
 	if ((error = copyin(NETBSD32PTR(ioc->buf), &SCARG(&ap, how), ioc->len)) != 0)
 		return error;
 	SCARG(&ap, s) = fd;
 	return sys_shutdown(l, &ap, &retval);
+}
 static int
 sockmod(file_t *fp, int fd, struct svr4_strioctl *ioc, struct lwp *l)
+{
 	switch (ioc->cmd) {
 	case SVR4_SI_OGETUDATA:
 		DPRINTF(("SI_OGETUDATA\n"));
 		return si_ogetudata(fp, fd, ioc, l);
 	case SVR4_SI_SHUTDOWN:
 		DPRINTF(("SI_SHUTDOWN\n"));
 		return si_shutdown(fp, fd, ioc, l);
 	case SVR4_SI_LISTEN:
 		DPRINTF(("SI_LISTEN\n"));
 		return si_listen(fp, fd, ioc, l);
 	case SVR4_SI_SETMYNAME:
 		DPRINTF(("SI_SETMYNAME\n"));
 		return 0;
 	case SVR4_SI_SETPEERNAME:
 		DPRINTF(("SI_SETPEERNAME\n"));
 		return 0;
 	case SVR4_SI_GETINTRANSIT:
 		DPRINTF(("SI_GETINTRANSIT\n"));
 		return 0;
 	case SVR4_SI_TCL_LINK:
 		DPRINTF(("SI_TCL_LINK\n"));
 		return 0;
 	case SVR4_SI_TCL_UNLINK:
 		DPRINTF(("SI_TCL_UNLINK\n"));
 		return 0;
 	case SVR4_SI_SOCKPARAMS:
 		DPRINTF(("SI_SOCKPARAMS\n"));
 		return si_sockparams(fp, fd, ioc, l);
 	case SVR4_SI_GETUDATA:
 		DPRINTF(("SI_GETUDATA\n"));
 		return si_getudata(fp, fd, ioc, l);
 	default:
 		DPRINTF(("Unknown sockmod ioctl %lx\n", ioc->cmd));
 		return 0;
+	}
+}
 static int
 ti_getinfo(file_t *fp, int fd, struct svr4_strioctl *ioc,
     struct lwp *l)
+{
 	int error;
 	struct svr4_infocmd info;
 	memset(&info, 0, sizeof(info));
-	if (ioc->len > sizeof(info))
+	/* tsdu is next after cmd, the only field we read */
 	if (ioc->len < offsetof(struct svr4_infocmd, tsdu) ||
 	    ioc->len > sizeof(info))
 		return EINVAL;
 	if ((error = copyin(NETBSD32PTR(ioc->buf), &info, ioc->len)) != 0)
 		return error;
 	if (info.cmd != SVR4_TI_INFO_REQUEST)
 		return EINVAL;
 	info.cmd = SVR4_TI_INFO_REPLY;
 	info.tsdu = 0;
 	info.etsdu = 1;
 	info.cdata = -2;
 	info.ddata = -2;
 	info.addr = 16;
 	info.opt = -1;
 	info.tidu = 16384;
 	info.serv = 2;
 	info.current = 0;
 	info.provider = 2;
 	ioc->len = sizeof(info);
 	if ((error = copyout(&info, NETBSD32PTR(ioc->buf), ioc->len)) != 0)
 		return error;
 	return 0;
+}
 static int
 ti_bind(file_t *fp, int fd, struct svr4_strioctl *ioc, struct lwp *l)
+{
 	int error;
 	struct svr4_strm *st = svr4_stream_get(fp);
 	struct sockaddr_in sain;
 	struct sockaddr_un saun;
 	void *skp, *sup = NULL;
 	int sasize;
 	struct svr4_strmcmd bnd;
 	struct mbuf *name;
 	if (st == NULL) {
 		DPRINTF(("ti_bind: bad file descriptor\n"));
 		return EINVAL;
+	}
-	if (ioc->len > sizeof(bnd))
+	if (ioc->len < offsetof(struct svr4_strmcmd, pad) ||
 	    ioc->len > sizeof(bnd))
 		return EINVAL;
 	if ((error = copyin(NETBSD32PTR(ioc->buf), &bnd, ioc->len)) != 0)
 		return error;
 	if (bnd.cmd != SVR4_TI_OLD_BIND_REQUEST) {
 		DPRINTF(("ti_bind: bad request %ld\n", bnd.cmd));
 		return EINVAL;
+	}
 	if (bnd.offs < 0 ||
 	    bnd.len < 0 ||
 	    bnd.len > ioc->len ||
 	    ioc->len - bnd.len < bnd.offs)
 		return EINVAL;
 	switch (st->s_family) {
 	case AF_INET:
 		skp = &sain;
 		sasize = sizeof(sain);
 		if (bnd.offs == 0)
 			goto reply;
 		if (ioc->len < sizeof(struct svr4_netaddr_in) ||
 		    bnd.offs > ioc->len - sizeof(struct svr4_netaddr_in))
 			return EINVAL;
 		netaddr_to_sockaddr_in(&sain, &bnd);
 		DPRINTF(("TI_BIND: fam %d, port %d, addr %x\n",
 			 sain.sin_family, sain.sin_port,
 			 sain.sin_addr.s_addr));
 		break;
 	case AF_LOCAL:
 		skp = &saun;
 		sasize = sizeof(saun);
 		if (bnd.offs == 0)
 			goto reply;
 		if (ioc->len < sizeof(struct svr4_netaddr_un) ||
 		    bnd.offs > ioc->len - sizeof(struct svr4_netaddr_un))
 			return EINVAL;
 		netaddr_to_sockaddr_un(&saun, &bnd);
 		if (saun.sun_path[0] == '\0')
 			goto reply;
 		DPRINTF(("TI_BIND: fam %d, path %s\n",
 			 saun.sun_family, saun.sun_path));
 		if ((error = clean_pipe(l, saun.sun_path)) != 0)
 			return error;
 		bnd.pad[28] = 0x00001000;	/* magic again */
 		break;
 	default:
 		DPRINTF(("TI_BIND: Unsupported address family %d\n",
 			 st->s_family));
 		return ENOSYS;
+	}
 	name = m_get(M_WAIT, MT_SONAME);
 	if (sasize > MLEN)
 		MEXTMALLOC(name, sasize, M_WAITOK);
 	memcpy(mtod(name, void *), skp, sasize);
 	DPRINTF(("TI_BIND: fileno %d\n", fd));
 	error = do_sys_bind(l, fd, name);
 	if (error != 0) {
 		DPRINTF(("TI_BIND: bind failed %d\n", error));
 		return error;
+	}
 reply:
 	if (sup == NULL) {
 		memset(&bnd, 0, sizeof(bnd));
 		bnd.len = sasize + 4;
 		bnd.offs = 0x10;	/* XXX */
+	}
 	bnd.cmd = SVR4_TI_BIND_REPLY;
 	if ((error = copyout(&bnd, NETBSD32PTR(ioc->buf), ioc->len)) != 0)
 		return error;
 	return 0;
+}
 static int
 timod(file_t *fp, int fd, struct svr4_strioctl *ioc, struct lwp *l)
+{
 	switch (ioc->cmd) {
 	case SVR4_TI_GETINFO:
 		DPRINTF(("TI_GETINFO\n"));
 		return ti_getinfo(fp, fd, ioc, l);
 	case SVR4_TI_OPTMGMT:
 		DPRINTF(("TI_OPTMGMT\n"));
 		return 0;
 	case SVR4_TI_BIND:
 		DPRINTF(("TI_BIND\n"));
 		return ti_bind(fp, fd, ioc, l);
 	case SVR4_TI_UNBIND:
 		DPRINTF(("TI_UNBIND\n"));
 		return 0;
 	default:
 		DPRINTF(("Unknown timod ioctl %lx\n", ioc->cmd));
 		return 0;
+	}
+}
 int
 svr4_stream_ti_ioctl(file_t *fp, struct lwp *l, register_t *retval, int fd, u_long cmd, void *dat)
+{
 	struct svr4_strbuf skb, *sub = (struct svr4_strbuf *) dat;
 	struct svr4_strm *st = svr4_stream_get(fp);
 	int error;
 	struct svr4_strmcmd sc;
 	struct mbuf *name;
 	if (st == NULL)
 		return EINVAL;
 	sc.offs = 0x10;
 	if ((error = copyin(sub, &skb, sizeof(skb))) != 0) {
 		DPRINTF(("ti_ioctl: error copying in strbuf\n"));
 		return error;
+	}
 	switch (cmd) {
 	case SVR4_TI_GETMYNAME:
 		DPRINTF(("TI_GETMYNAME\n"));
 		cmd = PRU_SOCKADDR;
 		break;
 	case SVR4_TI_GETPEERNAME:
 		DPRINTF(("TI_GETPEERNAME\n"));
 		cmd = PRU_PEERADDR;
 		break;
 	case SVR4_TI_SETMYNAME:
 		DPRINTF(("TI_SETMYNAME\n"));
 		return 0;
 	case SVR4_TI_SETPEERNAME:
 		DPRINTF(("TI_SETPEERNAME\n"));
 		return 0;
 	default:
 		DPRINTF(("ti_ioctl: Unknown ioctl %lx\n", cmd));
 		return ENOSYS;
+	}
 	error = do_sys_getsockname(l, fd, cmd, &name);
 	if (error != 0)
 		return error;
 	switch (st->s_family) {
 	case AF_INET:
 		sockaddr_to_netaddr_in(&sc, mtod(name, void *));
 		skb.len = sizeof (struct sockaddr_in);
 		break;
 	case AF_LOCAL:
 		sockaddr_to_netaddr_un(&sc, mtod(name, void *));
 		/* XXX: the length gets adjusted but the copyout doesn't */
 		skb.len = sizeof (struct sockaddr_un) + 4;
 		break;
 	default:
 		DPRINTF(("ti_ioctl: Unsupported address family %d\n",
 			 st->s_family));
 		m_free(name);
 		return ENOSYS;
+	}
 	error = copyout(SVR4_ADDROF(&sc), NETBSD32PTR(skb.buf), name->m_len);
 	m_free(name);
 	if (error != 0) {
 		DPRINTF(("ti_ioctl: error copying out socket data\n"));
 		return error;
+	}
 	if ((error = copyout(&skb, sub, sizeof(skb))) != 0) {
 		DPRINTF(("ti_ioctl: error copying out strbuf\n"));
 		return error;
+	}
 	return error;
+}
 static int
 i_nread(file_t *fp, struct lwp *l, register_t *retval, int fd,
     u_long cmd, void *dat)
+{
 	int error;
 	int nread = 0;
 	/*
 	 * We are supposed to return the message length in nread, and the
 	 * number of messages in retval. We don't have the notion of number
 	 * of stream messages, so we just find out if we have any bytes waiting
 	 * for us, and if we do, then we assume that we have at least one
 	 * message waiting for us.
 	 */
 	if ((error = (*fp->f_ops->fo_ioctl)(fp, FIONREAD, &nread)) != 0)
 		return error;
 	if (nread != 0)
 		*retval = 1;
 	else
 		*retval = 0;
 	return copyout(&nread, dat, sizeof(nread));
+}
 static int
 i_fdinsert(file_t *fp, struct lwp *l, register_t *retval, int fd,
     u_long cmd, void *dat)
+{
 	/*
 	 * Major hack again here. We assume that we are using this to
 	 * implement accept(2). If that is the case, we have already
 	 * called accept, and we have stored the file descriptor in
 	 * afd. We find the file descriptor that the code wants to use
 	 * in fd insert, and then we dup2() our accepted file descriptor
 	 * to it.
 	 */
 	int error;
 	struct svr4_strm *st = svr4_stream_get(fp);
 	struct svr4_strfdinsert fdi;
 	struct sys_dup2_args d2p;
 	struct sys_close_args clp;
 	if (st == NULL) {
 		DPRINTF(("fdinsert: bad file type\n"));
 		return EINVAL;
+	}
 	if (st->s_afd == -1) {
 		DPRINTF(("fdinsert: accept fd not found\n"));
 		return ENOENT;
+	}
 	if ((error = copyin(dat, &fdi, sizeof(fdi))) != 0) {
 		DPRINTF(("fdinsert: copyin failed %d\n", error));
 		return error;
+	}
 	SCARG(&d2p, from) = st->s_afd;
 	SCARG(&d2p, to) = fdi.fd;
 	if ((error = sys_dup2(l, &d2p, retval)) != 0) {
 		DPRINTF(("fdinsert: dup2(%d, %d) failed %d\n",
 		    st->s_afd, fdi.fd, error));
 		return error;
+	}
 	SCARG(&clp, fd) = st->s_afd;
 	if ((error = sys_close(l, &clp, retval)) != 0) {
 		DPRINTF(("fdinsert: close(%d) failed %d\n",
 		    st->s_afd, error));
 		return error;
+	}
 	st->s_afd = -1;
 	*retval = 0;
 	return 0;
+}
 static int
 _i_bind_rsvd(file_t *fp, struct lwp *l, register_t *retval,
     int fd, u_long cmd, void *dat)
+{
 	struct sys_mkfifo_args ap;
 	/*
 	 * This is a supposed to be a kernel and library only ioctl.
 	 * It gets called before ti_bind, when we have a unix
 	 * socket, to physically create the socket transport and
 	 * ``reserve'' it. I don't know how this get reserved inside
 	 * the kernel, but we are going to create it nevertheless.
 	 */
 	SCARG(&ap, path) = dat;
 	SCARG(&ap, mode) = S_IFIFO;
 	return sys_mkfifo(l, &ap, retval);
+}
 static int
 _i_rele_rsvd(file_t *fp, struct lwp *l, register_t *retval,
     int fd, u_long cmd, void *dat)
+{
 	struct sys_unlink_args ap;
 	/*
 	 * This is a supposed to be a kernel and library only ioctl.
 	 * I guess it is supposed to release the socket.
 	 */
 	SCARG(&ap, path) = dat;
 	return sys_unlink(l, &ap, retval);
+}
 static int
 i_str(file_t *fp, struct lwp *l, register_t *retval, int fd,
     u_long cmd, void *dat)
+{
 	int			 error;
 	struct svr4_strioctl	 ioc;
 	/*
 	 * Noop on non sockets
 	 */
 	if (fp->f_type != DTYPE_SOCKET)
 		return 0;
 	if ((error = copyin(dat, &ioc, sizeof(ioc))) != 0)
 		return error;
 #ifdef DEBUG_SVR4
 	if ((error = show_ioc(">", &ioc)) != 0)
 		return error;
 #endif /* DEBUG_SVR4 */
 	switch (ioc.cmd & 0xff00) {
 	case SVR4_SIMOD:
 		if ((error = sockmod(fp, fd, &ioc, l)) != 0)
 			return error;
 		break;
 	case SVR4_TIMOD:
 		if ((error = timod(fp, fd, &ioc, l)) != 0)
 			return error;
 		break;
 	default:
 		DPRINTF(("Unimplemented module %c %ld\n",
 			 (char) (cmd >> 8), cmd & 0xff));
 		return 0;
+	}
 #ifdef DEBUG_SVR4
 	if ((error = show_ioc("<", &ioc)) != 0)
 		return error;
 #endif /* DEBUG_SVR4 */
 	return copyout(&ioc, dat, sizeof(ioc));
+}
 static int
 i_setsig(file_t *fp, struct lwp *l, register_t *retval, int fd,
     u_long cmd, void *dat)
+{
 	/*
 	 * This is the best we can do for now; we cannot generate
 	 * signals only for specific events so the signal mask gets
 	 * ignored; we save it just to pass it to a possible I_GETSIG...
+	 *
 	 * We alse have to fix the O_ASYNC fcntl bit, so the
 	 * process will get SIGPOLLs.
 	 */
 	struct sys_fcntl_args fa;
 	int error;
 	register_t oflags, flags;
 	struct svr4_strm *st = svr4_stream_get(fp);
 	if (st == NULL) {
 		DPRINTF(("i_setsig: bad file descriptor\n"));
 		return EINVAL;
+	}
 	/* get old status flags */
 	SCARG(&fa, fd) = fd;
 	SCARG(&fa, cmd) = F_GETFL;
 	if ((error = sys_fcntl(l, &fa, &oflags)) != 0)
 		return error;
 	/* update the flags */
 	if (dat != NULL) {
 		int mask;
 		flags = oflags | O_ASYNC;
 		mask = (int)(u_long)dat;
 		if (mask & ~SVR4_S_ALLMASK) {
 			DPRINTF(("i_setsig: bad eventmask data %x\n", mask));
 			return EINVAL;
+		}
 		st->s_eventmask = mask;
+	}
 	else {
 		flags = oflags & ~O_ASYNC;
 		st->s_eventmask = 0;
+	}
 	/* set the new flags, if changed */
 	if (flags != oflags) {
 		SCARG(&fa, cmd) = F_SETFL;
 		SCARG(&fa, arg) = (void *) flags;
 		if ((error = sys_fcntl(l, &fa, &flags)) != 0)
 			return error;
+	}
 	/* set up SIGIO receiver if needed */
 	if (dat != NULL) {
 		SCARG(&fa, cmd) = F_SETOWN;
 		SCARG(&fa, arg) = (void *)(u_long)l->l_proc->p_pid;
 		return sys_fcntl(l, &fa, &flags);
+	}
 	return 0;
+}
 static int
 i_getsig(file_t *fp, struct lwp *l, register_t *retval,
     int fd, u_long cmd, void *dat)
+{
 	int error;
 	if (dat != NULL) {
 		struct svr4_strm *st = svr4_stream_get(fp);
 		if (st == NULL) {
 			DPRINTF(("i_getsig: bad file descriptor\n"));
 			return EINVAL;
+		}
 		if ((error = copyout(&st->s_eventmask, dat,
 		    sizeof(st->s_eventmask))) != 0) {
 			DPRINTF(("i_getsig: bad eventmask pointer\n"));
 			return error;
+		}
+	}
 	return 0;
+}
 int
 svr4_stream_ioctl(file_t *fp, struct lwp *l, register_t *retval, int fd, u_long cmd, void *dat)
+{
 	*retval = 0;
 	/*
 	 * All the following stuff assumes "sockmod" is pushed...
 	 */
 	switch (cmd) {
 	case SVR4_I_NREAD:
 		DPRINTF(("I_NREAD\n"));
 		return i_nread(fp, l, retval, fd, cmd, dat);
 	case SVR4_I_PUSH:
 		DPRINTF(("I_PUSH\n"));
 		return 0;
 	case SVR4_I_POP:
 		DPRINTF(("I_POP\n"));
 		return 0;
 	case SVR4_I_LOOK:
 		DPRINTF(("I_LOOK\n"));
 		return 0;
 	case SVR4_I_FLUSH:
 		DPRINTF(("I_FLUSH\n"));
 		return 0;
 	case SVR4_I_SRDOPT:
 		DPRINTF(("I_SRDOPT\n"));
 		return 0;
 	case SVR4_I_GRDOPT:
 		DPRINTF(("I_GRDOPT\n"));
 		return 0;
 	case SVR4_I_STR:
 		DPRINTF(("I_STR\n"));
 		return i_str(fp, l, retval, fd, cmd, dat);
 	case SVR4_I_SETSIG:
 		DPRINTF(("I_SETSIG\n"));
 		return i_setsig(fp, l, retval, fd, cmd, dat);
 	case SVR4_I_GETSIG:
 		DPRINTF(("I_GETSIG\n"));
 		return i_getsig(fp, l, retval, fd, cmd, dat);
 	case SVR4_I_FIND:
 		DPRINTF(("I_FIND\n"));
 		/*
 		 * Here we are not pushing modules really, we just
 		 * pretend all are present
 		 */
 		*retval = 1;
 		return 0;
 	case SVR4_I_LINK:
 		DPRINTF(("I_LINK\n"));
 		return 0;
 	case SVR4_I_UNLINK:
 		DPRINTF(("I_UNLINK\n"));
 		return 0;
 	case SVR4_I_ERECVFD:
 		DPRINTF(("I_ERECVFD\n"));
 		return 0;
 	case SVR4_I_PEEK:
 		DPRINTF(("I_PEEK\n"));
 		return 0;
 	case SVR4_I_FDINSERT:
 		DPRINTF(("I_FDINSERT\n"));
 		return i_fdinsert(fp, l, retval, fd, cmd, dat);
 	case SVR4_I_SENDFD:
 		DPRINTF(("I_SENDFD\n"));
 		return 0;
 	case SVR4_I_RECVFD:
 		DPRINTF(("I_RECVFD\n"));
 		return 0;
 	case SVR4_I_SWROPT:
 		DPRINTF(("I_SWROPT\n"));
 		return 0;
 	case SVR4_I_GWROPT:
 		DPRINTF(("I_GWROPT\n"));
 		return 0;
 	case SVR4_I_LIST:
 		DPRINTF(("I_LIST\n"));
 		return 0;
 	case SVR4_I_PLINK:
 		DPRINTF(("I_PLINK\n"));
 		return 0;
 	case SVR4_I_PUNLINK:
 		DPRINTF(("I_PUNLINK\n"));
 		return 0;
 	case SVR4_I_SETEV:
 		DPRINTF(("I_SETEV\n"));
 		return 0;
 	case SVR4_I_GETEV:
 		DPRINTF(("I_GETEV\n"));
 		return 0;
 	case SVR4_I_STREV:
 		DPRINTF(("I_STREV\n"));
 		return 0;
 	case SVR4_I_UNSTREV:
 		DPRINTF(("I_UNSTREV\n"));
 		return 0;
 	case SVR4_I_FLUSHBAND:
 		DPRINTF(("I_FLUSHBAND\n"));
 		return 0;
 	case SVR4_I_CKBAND:
 		DPRINTF(("I_CKBAND\n"));
 		return 0;
 	case SVR4_I_GETBAND:
 		DPRINTF(("I_GETBANK\n"));
 		return 0;
 	case SVR4_I_ATMARK:
 		DPRINTF(("I_ATMARK\n"));
 		return 0;
 	case SVR4_I_SETCLTIME:
 		DPRINTF(("I_SETCLTIME\n"));
 		return 0;
 	case SVR4_I_GETCLTIME:
 		DPRINTF(("I_GETCLTIME\n"));
 		return 0;
 	case SVR4_I_CANPUT:
 		DPRINTF(("I_CANPUT\n"));
 		return 0;
 	case SVR4__I_BIND_RSVD:
 		DPRINTF(("_I_BIND_RSVD\n"));
 		return _i_bind_rsvd(fp, l, retval, fd, cmd, dat);
 	case SVR4__I_RELE_RSVD:
 		DPRINTF(("_I_RELE_RSVD\n"));
 		return _i_rele_rsvd(fp, l, retval, fd, cmd, dat);
 	default:
 		DPRINTF(("unimpl cmd = %lx\n", cmd));
 		break;
+	}
 	return 0;
+}
 int
 svr4_sys_putmsg(struct lwp *l, const struct svr4_sys_putmsg_args *uap, register_t *retval)
+{
 	struct proc *p = l->l_proc;
 	file_t	*fp;
 	struct svr4_strbuf dat, ctl;
 	struct svr4_strmcmd sc;
 	struct sockaddr_in sain;
 	struct sockaddr_un saun;
 	void *skp;
 	int sasize;
 	struct svr4_strm *st;
 	int error;
 	struct mbuf *nam;
 	struct msghdr msg;
 	struct iovec aiov;
 #ifdef DEBUG_SVR4
 	show_msg(">putmsg", SCARG(uap, fd), SCARG(uap, ctl),
 		 SCARG(uap, dat), SCARG(uap, flags));
 #endif /* DEBUG_SVR4 */
 	if ((fp = fd_getfile(SCARG(uap, fd))) == NULL)
 		return EBADF;
 	KERNEL_LOCK(1, NULL);	/* svr4_find_socket */
 	if (SCARG_PTR(uap, ctl) != NULL) {
 		if ((error = copyin(SCARG_PTR(uap, ctl),
 				    &ctl, sizeof(ctl))) != 0)
 			goto out;
 	} else
 		ctl.len = -1;
 	if (SCARG_PTR(uap, dat) != NULL) {
 	    	if ((error = copyin(SCARG_PTR(uap, dat),
 				    &dat, sizeof(dat))) != 0)
 			goto out;
 	} else
 		dat.len = -1;
 	/*
 	 * Only for sockets for now.
 	 */
 	if ((st = svr4_stream_get(fp)) == NULL) {
 		DPRINTF(("putmsg: bad file type\n"));
 		error = EINVAL;
 		goto out;
+	}
-	if (ctl.len > sizeof(sc)) {
+	if (ctl.len < offsetof(struct svr4_strmcmd, pad) ||
 	    ctl.len > sizeof(sc)) {
 		DPRINTF(("putmsg: Bad control size %ld != %d\n",
 		    (unsigned long)sizeof(struct svr4_strmcmd), ctl.len));
 		error = EINVAL;
 		goto out;
+	}
 	if ((error = copyin(NETBSD32PTR(ctl.buf), &sc, ctl.len)) != 0)
 		goto out;
 	if (sc.offs < 0 ||
 	    sc.len < 0 ||
 	    sc.len > ctl.len ||
 	    sc.offs > ctl.len - sc.len) {
 		error = EINVAL;
 		goto out;
+	}
 	switch (st->s_family) {
 	case AF_INET:
 		if (sc.len != sizeof(sain)) {
 #ifdef notyet
 		        if (sc.cmd == SVR4_TI_DATA_REQUEST) {
 			        struct sys_write_args wa;
 				/* Solaris seems to use sc.cmd = 3 to
 				 * send "expedited" data.  telnet uses
 				 * this for options processing, sending EOF,
 				 * etc.  I'm sure other things use it too.
 				 * I don't have any documentation
 				 * on it, so I'm making a guess that this
 				 * is how it works. newton@atdot.dotat.org XXX
+				 *
 				 * Hmm, expedited data seems to be sc.cmd = 4.
 				 * I think 3 is normal data. (christos)
 				 */
 				DPRINTF(("sending expedited data (?)\n"));
 				SCARG(&wa, fd) = SCARG(uap, fd);
 				SCARG(&wa, buf) = dat.buf;
 				SCARG(&wa, nbyte) = dat.len;
 				error = sys_write(l, &wa, retval);
 				goto out;
+			}
 #endif
 	                DPRINTF(("putmsg: Invalid inet length %ld\n", sc.len));
 			error = EINVAL;
 			goto out;
+		}
 		netaddr_to_sockaddr_in(&sain, &sc);
 		skp = &sain;
 		sasize = sizeof(sain);
 		error = sain.sin_family != st->s_family;
 		break;
 	case AF_LOCAL:
 		if (ctl.len == 8) {
 			/* We are doing an accept; succeed */
 			DPRINTF(("putmsg: Do nothing\n"));
 			*retval = 0;
 			error = 0;
 			goto out;
 		} else if (sc.len < sizeof(dev_t[2])) {
-		else {
+			*retval = 0;
 			error = EINVAL;
 			goto out;
 		} else {
 			/* Maybe we've been given a device/inode pair */
 			dev_t *dev = SVR4_ADDROF(&sc);
 			svr4_ino_t *ino = (svr4_ino_t *) &dev[1];
 			skp = svr4_find_socket(p, fp, *dev, *ino);
 			if (skp == NULL) {
 				skp = &saun;
 				/* I guess we have it by name */
 				netaddr_to_sockaddr_un(skp, &sc);
+			}
 			sasize = sizeof(saun);
+		}
 		break;
 	default:
 		DPRINTF(("putmsg: Unsupported address family %d\n",
 			 st->s_family));
 		error = ENOSYS;
 		goto out;
+	}
 	nam = m_get(M_WAIT, MT_SONAME);
 	nam->m_len = sasize;
 	memcpy(mtod(nam, void *), skp, sasize);
  	switch (st->s_cmd = sc.cmd) {
 	case SVR4_TI_CONNECT_REQUEST:	/* connect 	*/
 	 	KERNEL_UNLOCK_ONE(NULL);
 		fd_putfile(SCARG(uap, fd));
 		return do_sys_connect(l, SCARG(uap, fd), nam);
 	case SVR4_TI_SENDTO_REQUEST:	/* sendto 	*/
 	 	KERNEL_UNLOCK_ONE(NULL);
 		fd_putfile(SCARG(uap, fd));
 		msg.msg_name = nam;
 		msg.msg_namelen = sasize;
 		msg.msg_iov = &aiov;
 		msg.msg_iovlen = 1;
 		msg.msg_control = NULL;
 		msg.msg_flags = MSG_NAMEMBUF;
 		aiov.iov_base = NETBSD32PTR(dat.buf);
 		aiov.iov_len = dat.len;
 		error = do_sys_sendmsg(l, SCARG(uap, fd), &msg,
 			       SCARG(uap, flags), retval);
 		*retval = 0;
 		return error;
 	default:
 		m_free(nam);
 		DPRINTF(("putmsg: Unimplemented command %lx\n", sc.cmd));
 		error = ENOSYS;
 		goto out;
+	}
  out:
  	KERNEL_UNLOCK_ONE(NULL);
  	fd_putfile(SCARG(uap, fd));
  	return error;
+}
 int
 svr4_sys_getmsg(struct lwp *l, const struct svr4_sys_getmsg_args *uap, register_t *retval)
+{
 	file_t *fp;
 	struct svr4_strbuf dat, ctl;
 	struct svr4_strmcmd sc;
 	int error = 0;
 	struct msghdr msg;
 	struct iovec aiov;
 	struct svr4_strm *st;
 	int fl;
 	struct mbuf *name;
 	memset(&sc, 0, sizeof(sc));
 #ifdef DEBUG_SVR4
 	show_msg(">getmsg", SCARG(uap, fd), SCARG(uap, ctl),
 		 SCARG(uap, dat), 0);
 #endif /* DEBUG_SVR4 */
 	if ((fp = fd_getfile(SCARG(uap, fd))) == NULL)
 		return EBADF;
 	if (SCARG_PTR(uap, ctl) != NULL) {
 		if ((error = copyin(SCARG_PTR(uap, ctl), &ctl,
 				    sizeof(ctl))) != 0)
 			goto out;
 	} else {
 		ctl.len = -1;
 		ctl.maxlen = 0;
+	}
 	if (SCARG_PTR(uap, dat) != NULL) {
 	    	if ((error = copyin(SCARG_PTR(uap, dat), &dat,
 				    sizeof(dat))) != 0)
 			goto out;
 	} else {
 		dat.len = -1;
 		dat.maxlen = 0;
+	}
 	/*
 	 * Only for sockets for now.
 	 */
 	if ((st = svr4_stream_get(fp)) == NULL) {
 		DPRINTF(("getmsg: bad file type\n"));
 		error = EINVAL;
 		goto out;
+	}
 	if (ctl.maxlen == -1 || dat.maxlen == -1) {
 		DPRINTF(("getmsg: Cannot handle -1 maxlen (yet)\n"));
 		error = ENOSYS;
 		goto out;
+	}
 	switch (st->s_family) {
 	case AF_INET:
 	case AF_LOCAL:
 		break;
 	default:
 		DPRINTF(("getmsg: Unsupported address family %d\n",
 			 st->s_family));
 		goto out;
+	}
 	switch (st->s_cmd) {
 	case SVR4_TI_CONNECT_REQUEST:
 		DPRINTF(("getmsg: TI_CONNECT_REQUEST\n"));
 		/*
 		 * We do the connect in one step, so the putmsg should
 		 * have gotten the error.
 		 */
 		sc.cmd = SVR4_TI_OK_REPLY;
 		sc.len = 0;
 		ctl.len = 8;
 		dat.len = -1;
 		fl = 1;
 		st->s_cmd = sc.cmd;
 		break;
 	case SVR4_TI_OK_REPLY:
 		DPRINTF(("getmsg: TI_OK_REPLY\n"));
 		/*
 		 * We are immediately after a connect reply, so we send
 		 * a connect verification.
 		 */
 		error = do_sys_getsockname(l, SCARG(uap, fd), PRU_SOCKADDR,
 		    &name);
 		if (error != 0) {
 			DPRINTF(("getmsg: getpeername failed %d\n", error));
 			goto out;
+		}
 		sc.cmd = SVR4_TI_CONNECT_REPLY;
 		sc.pad[0] = 0x4;
 		sc.offs = 0x18;
 		sc.pad[1] = 0x14;
 		sc.pad[2] = 0x04000402;
 		switch (st->s_family) {
 		case AF_INET:
 			sc.len = sizeof (struct sockaddr_in) + 4;
 			sockaddr_to_netaddr_in(&sc, mtod(name, void *));
 			break;
 		case AF_LOCAL:
 			sc.len = sizeof (struct sockaddr_un) + 4;
 			sockaddr_to_netaddr_un(&sc, mtod(name, void *));
 			break;
 		default:
 			m_free(name);
 			error = ENOSYS;
 			goto out;
+		}
 		m_free(name);
 		ctl.len = 40;
 		dat.len = -1;
 		fl = 0;
 		st->s_cmd = sc.cmd;
 		break;
 	case SVR4_TI__ACCEPT_OK:
 		DPRINTF(("getmsg: TI__ACCEPT_OK\n"));
 		/*
 		 * We do the connect in one step, so the putmsg should
 		 * have gotten the error.
 		 */
 		sc.cmd = SVR4_TI_OK_REPLY;
 		sc.len = 1;
 		ctl.len = 8;
 		dat.len = -1;
 		fl = 1;
 		st->s_cmd = SVR4_TI__ACCEPT_WAIT;
 		break;
 	case SVR4_TI__ACCEPT_WAIT:
 		DPRINTF(("getmsg: TI__ACCEPT_WAIT\n"));
 		/*
 		 * We are after a listen, so we try to accept...
 		 */
 		error = do_sys_accept(l, SCARG(uap, fd), &name, retval,
 		    NULL, 0, FNONBLOCK);
 		if (error != 0) {
 			DPRINTF(("getmsg: accept failed %d\n", error));
 			goto out;
+		}
 		st->s_afd = *retval;
 		DPRINTF(("getmsg: Accept fd = %d\n", st->s_afd));
 		sc.cmd = SVR4_TI_ACCEPT_REPLY;
 		sc.offs = 0x18;
 		sc.pad[0] = 0x0;
 		switch (st->s_family) {
 		case AF_INET:
 			sc.pad[1] = 0x28;
 			sockaddr_to_netaddr_in(&sc, mtod(name, void *));
 			ctl.len = 40;
 			sc.len = sizeof (struct sockaddr_in);
 			break;
 		case AF_LOCAL:
 			sc.pad[1] = 0x00010000;
 			sc.pad[2] = 0xf6bcdaa0;	/* I don't know what that is */
 			sc.pad[3] = 0x00010000;
 			ctl.len = 134;
 			sc.len = sizeof (struct sockaddr_un) + 4;
 			break;
 		default:
 			m_free(name);
 			error = ENOSYS;
 			goto out;
+		}
 		m_free(name);
 		dat.len = -1;
 		fl = 0;
 		st->s_cmd = SVR4_TI__ACCEPT_OK;
 		break;
 	case SVR4_TI_SENDTO_REQUEST:
 		/*
 		 * XXX: dsl - I think this means that because we last did a
 		 * 'sendto' we'd better do a recvfrom now.
 		 */
 		DPRINTF(("getmsg: TI_SENDTO_REQUEST\n"));
 		if (ctl.maxlen > 36 && ctl.len < 36)
 		    ctl.len = 36;
 		if (ctl.len > sizeof(sc))
 			ctl.len = sizeof(sc);
 		if (ctl.len < offsetof(struct svr4_strmcmd, pad)) {
 			error = EINVAL;
 			goto out;
+		}
 		if ((error = copyin(NETBSD32PTR(ctl.buf), &sc, ctl.len)) != 0)
 			goto out;
 		if (sc.offs < 0) {
 			error = EINVAL;
 			goto out;
+		}
 		msg.msg_name = NULL;
 		msg.msg_namelen = 0;
 		msg.msg_iov = &aiov;
 		msg.msg_iovlen = 1;
 		msg.msg_control = 0;
 		aiov.iov_base = NETBSD32PTR(dat.buf);
 		aiov.iov_len = dat.maxlen;
 		msg.msg_flags = 0;
 		error = do_sys_recvmsg(l,  SCARG(uap, fd), &msg, &name, NULL,
 		    retval);
 		if (error) {
 			DPRINTF(("getmsg: do_sys_recvmsg failed %d\n", error));
 			goto out;
+		}
 		sc.cmd = SVR4_TI_RECVFROM_IND;
 		switch (st->s_family) {
 		case AF_INET:
 			sc.len = sizeof (struct sockaddr_in);
 			sockaddr_to_netaddr_in(&sc, mtod(name, void *));
 			break;
 		case AF_LOCAL:
 			sc.len = sizeof (struct sockaddr_un) + 4;
 			sockaddr_to_netaddr_un(&sc, mtod(name, void *));
 			break;
 		default:
 			m_free(name);
 			error = ENOSYS;
 			goto out;
+		}
 		m_free(name);
 		dat.len = *retval;
 		fl = 0;
 		st->s_cmd = sc.cmd;
 		break;
 	default:
 		st->s_cmd = sc.cmd;
 #ifdef notyet
 		if (st->s_cmd == SVR4_TI_CONNECT_REQUEST) {
 		        struct sys_read_args ra;
 			/* More weirdness:  Again, I can't find documentation
 			 * to back this up, but when a process does a generic
 			 * "getmsg()" call it seems that the command field is
 			 * zero and the length of the data area is zero.  I
 			 * think processes expect getmsg() to fill in dat.len
 			 * after reading at most dat.maxlen octets from the
 			 * stream.  Since we're using sockets I can let
 			 * read() look after it and frob return values
 			 * appropriately (or inappropriately :-)
 			 *   -- newton@atdot.dotat.org        XXX
 			 */
 			SCARG(&ra, fd) = SCARG(uap, fd);
 			SCARG(&ra, buf) = dat.buf;
 			SCARG(&ra, nbyte) = dat.maxlen;
 			if ((error = sys_read(p, &ra, retval)) != 0)
 			        goto out;
 			dat.len = *retval;
 			*retval = 0;
 			st->s_cmd = SVR4_TI_SENDTO_REQUEST;
 			break;
+		}
 #endif
 		DPRINTF(("getmsg: Unknown state %x\n", st->s_cmd));
 		error = EINVAL;
 		goto out;
+	}
 	if (SCARG_PTR(uap, ctl)) {
 		if (ctl.len != -1)
 			if ((error = copyout(&sc, NETBSD32PTR(ctl.buf),
 					     ctl.len)) != 0)
 				goto out;
 		if ((error = copyout(&ctl, SCARG_PTR(uap, ctl),
 				     sizeof(ctl))) != 0)
 			goto out;
+	}
 	if (SCARG_PTR(uap, dat)) {
 		if ((error = copyout(&dat, SCARG_PTR(uap, dat),
 				     sizeof(dat))) != 0)
 			goto out;
+	}
 	if (SCARG_PTR(uap, flags)) { /* XXX: Need translation */
 		if ((error = copyout(&fl, SCARG_PTR(uap, flags),
 				     sizeof(fl))) != 0)
 			goto out;
+	}
 	*retval = 0;
 #ifdef DEBUG_SVR4
 	show_msg("<getmsg", SCARG(uap, fd), SCARG(uap, ctl),
 		 SCARG(uap, dat), fl);
 #endif /* DEBUG_SVR4 */
  out:
  	fd_putfile(SCARG(uap, fd));
 	return error;
+}

 @@ -1,646 +1,674 @@
-/*	$NetBSD: svr4_32_signal.c,v 1.26 2008/04/28 20:23:46 martin Exp $	 */
+/*	$NetBSD: svr4_32_signal.c,v 1.26.56.1 2017/08/19 03:40:48 snj Exp $	 */
 /*-
  * Copyright (c) 1994, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas and by Charles M. Hannum.
+ *
  * 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: svr4_32_signal.c,v 1.26 2008/04/28 20:23:46 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_signal.c,v 1.26.56.1 2017/08/19 03:40:48 snj Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_svr4.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 #include <sys/malloc.h>
 #include <sys/wait.h>
 #include <sys/syscallargs.h>
 #include <compat/svr4_32/svr4_32_types.h>
 #include <compat/svr4_32/svr4_32_signal.h>
 #include <compat/svr4_32/svr4_32_lwp.h>
 #include <compat/svr4_32/svr4_32_ucontext.h>
 #include <compat/svr4_32/svr4_32_syscallargs.h>
 #include <compat/svr4_32/svr4_32_util.h>
 #include <compat/common/compat_sigaltstack.h>
 #define	svr4_sigmask(n)		(1 << (((n) - 1) & 31))
 #define	svr4_sigword(n)		(((n) - 1) >> 5)
 #define svr4_sigemptyset(s)	memset((s), 0, sizeof(*(s)))
 #define	svr4_sigismember(s, n)	((s)->bits[svr4_sigword(n)] & svr4_sigmask(n))
 #define	svr4_sigaddset(s, n)	((s)->bits[svr4_sigword(n)] |= svr4_sigmask(n))
 static inline void svr4_32_sigfillset(svr4_32_sigset_t *);
 void svr4_32_to_native_sigaction(const struct svr4_32_sigaction *,
 				struct sigaction *);
 void native_to_svr4_32_sigaction(const struct sigaction *,
 				struct svr4_32_sigaction *);
 #ifndef COMPAT_SVR4
 const int native_to_svr4_signo[NSIG] = {
 ,			/* 0 */
 	SVR4_SIGHUP,		/* 1 */
 	SVR4_SIGINT,		/* 2 */
 	SVR4_SIGQUIT,		/* 3 */
 	SVR4_SIGILL,		/* 4 */
 	SVR4_SIGTRAP,		/* 5 */
 	SVR4_SIGABRT,		/* 6 */
 	SVR4_SIGEMT,		/* 7 */
 	SVR4_SIGFPE,		/* 8 */
 	SVR4_SIGKILL,		/* 9 */
 	SVR4_SIGBUS,		/* 10 */
 	SVR4_SIGSEGV,		/* 11 */
 	SVR4_SIGSYS,		/* 12 */
 	SVR4_SIGPIPE,		/* 13 */
 	SVR4_SIGALRM,		/* 14 */
 	SVR4_SIGTERM,		/* 15 */
 	SVR4_SIGURG,		/* 16 */
 	SVR4_SIGSTOP,		/* 17 */
 	SVR4_SIGTSTP,		/* 18 */
 	SVR4_SIGCONT,		/* 19 */
 	SVR4_SIGCHLD,		/* 20 */
 	SVR4_SIGTTIN,		/* 21 */
 	SVR4_SIGTTOU,		/* 22 */
 	SVR4_SIGIO,		/* 23 */
 	SVR4_SIGXCPU,		/* 24 */
 	SVR4_SIGXFSZ,		/* 25 */
 	SVR4_SIGVTALRM,		/* 26 */
 	SVR4_SIGPROF,		/* 27 */
 	SVR4_SIGWINCH,		/* 28 */
 ,			/* 29 SIGINFO */
 	SVR4_SIGUSR1,		/* 30 */
 	SVR4_SIGUSR2,		/* 31 */
 	SVR4_SIGPWR,		/* 32 */
 	SVR4_SIGRTMIN + 0,	/* 33 */
 	SVR4_SIGRTMIN + 1,	/* 34 */
 	SVR4_SIGRTMIN + 2,	/* 35 */
 	SVR4_SIGRTMIN + 3,	/* 36 */
 	SVR4_SIGRTMIN + 4,	/* 37 */
 	SVR4_SIGRTMIN + 5,	/* 38 */
 	SVR4_SIGRTMIN + 6,	/* 39 */
 	SVR4_SIGRTMIN + 7,	/* 40 */
 	SVR4_SIGRTMIN + 8,	/* 41 */
 	SVR4_SIGRTMIN + 9,	/* 42 */
 	SVR4_SIGRTMIN + 10,	/* 43 */
 	SVR4_SIGRTMIN + 11,	/* 44 */
 	SVR4_SIGRTMIN + 12,	/* 45 */
 	SVR4_SIGRTMIN + 13,	/* 46 */
 	SVR4_SIGRTMIN + 14,	/* 47 */
 	SVR4_SIGRTMIN + 15,	/* 48 */
 	SVR4_SIGRTMIN + 16,	/* 49 */
 	SVR4_SIGRTMIN + 17,	/* 50 */
 	SVR4_SIGRTMIN + 18,	/* 51 */
 	SVR4_SIGRTMIN + 19,	/* 52 */
 	SVR4_SIGRTMIN + 20,	/* 53 */
 	SVR4_SIGRTMIN + 21,	/* 54 */
 	SVR4_SIGRTMIN + 22,	/* 55 */
 	SVR4_SIGRTMIN + 23,	/* 56 */
 	SVR4_SIGRTMIN + 24,	/* 57 */
 	SVR4_SIGRTMIN + 25,	/* 58 */
 	SVR4_SIGRTMIN + 26,	/* 59 */
 	SVR4_SIGRTMIN + 27,	/* 60 */
 	SVR4_SIGRTMIN + 28,	/* 61 */
 	SVR4_SIGRTMIN + 29,	/* 62 */
 	SVR4_SIGRTMIN + 30,	/* 63 */
 };
 const int svr4_to_native_signo[SVR4_NSIG] = {
 ,			/* 0 */
 	SIGHUP,			/* 1 */
 	SIGINT,			/* 2 */
 	SIGQUIT,		/* 3 */
 	SIGILL,			/* 4 */
 	SIGTRAP,		/* 5 */
 	SIGABRT,		/* 6 */
 	SIGEMT,			/* 7 */
 	SIGFPE,			/* 8 */
 	SIGKILL,		/* 9 */
 	SIGBUS,			/* 10 */
 	SIGSEGV,		/* 11 */
 	SIGSYS,			/* 12 */
 	SIGPIPE,		/* 13 */
 	SIGALRM,		/* 14 */
 	SIGTERM,		/* 15 */
 	SIGUSR1,		/* 16 */
 	SIGUSR2,		/* 17 */
 	SIGCHLD,		/* 18 */
 	SIGPWR,			/* 19 */
 	SIGWINCH,		/* 20 */
 	SIGURG,			/* 21 */
 	SIGIO,			/* 22 */
 	SIGSTOP,		/* 23 */
 	SIGTSTP,		/* 24 */
 	SIGCONT,		/* 25 */
 	SIGTTIN,		/* 26 */
 	SIGTTOU,		/* 27 */
 	SIGVTALRM,		/* 28 */
 	SIGPROF,		/* 29 */
 	SIGXCPU,		/* 30 */
 	SIGXFSZ,		/* 31 */
 	SIGRTMIN + 0,		/* 32 */
 	SIGRTMIN + 1,		/* 33 */
 	SIGRTMIN + 2,		/* 34 */
 	SIGRTMIN + 3,		/* 35 */
 	SIGRTMIN + 4,		/* 36 */
 	SIGRTMIN + 5,		/* 37 */
 	SIGRTMIN + 6,		/* 38 */
 	SIGRTMIN + 7,		/* 39 */
 	SIGRTMIN + 8,		/* 40 */
 	SIGRTMIN + 9,		/* 41 */
 	SIGRTMIN + 10,		/* 42 */
 	SIGRTMIN + 11,		/* 43 */
 	SIGRTMIN + 12,		/* 44 */
 	SIGRTMIN + 13,		/* 45 */
 	SIGRTMIN + 14,		/* 46 */
 	SIGRTMIN + 15,		/* 47 */
 	SIGRTMIN + 16,		/* 48 */
 	SIGRTMIN + 17,		/* 49 */
 	SIGRTMIN + 18,		/* 50 */
 	SIGRTMIN + 19,		/* 51 */
 	SIGRTMIN + 20,		/* 52 */
 	SIGRTMIN + 21,		/* 53 */
 	SIGRTMIN + 22,		/* 54 */
 	SIGRTMIN + 23,		/* 55 */
 	SIGRTMIN + 24,		/* 56 */
 	SIGRTMIN + 25,		/* 57 */
 	SIGRTMIN + 26,		/* 58 */
 	SIGRTMIN + 27,		/* 59 */
 	SIGRTMIN + 28,		/* 60 */
 	SIGRTMIN + 29,		/* 61 */
 	SIGRTMIN + 30,		/* 62 */
 ,			/* 63 */
 };
 #endif
 static int
 svr4_32_decode_signum(int signum, int *native_signo, int *sigcall)
+{
 	if (SVR4_SIGNO(signum) >= SVR4_NSIG)
 		return EINVAL;
 	if (native_signo)
 		*native_signo = svr4_to_native_signo[SVR4_SIGNO(signum)];
 	if (sigcall)
 		*sigcall = SVR4_SIGCALL(signum);
 	return 0;
+}
 static inline void
 svr4_32_sigfillset(svr4_32_sigset_t *s)
+{
 	int i;
 	svr4_sigemptyset(s);
 	for (i = 1; i < SVR4_NSIG; i++)
 		if (svr4_to_native_signo[i] != 0)
 			svr4_sigaddset(s, i);
+}
 void
 svr4_32_to_native_sigset(const svr4_32_sigset_t *sss, sigset_t *bss)
+{
 	int i, newsig;
 	sigemptyset(bss);
 	for (i = 1; i < SVR4_NSIG; i++) {
 		if (svr4_sigismember(sss, i)) {
 			newsig = svr4_to_native_signo[i];
 			if (newsig)
 				sigaddset(bss, newsig);
+		}
+	}
+}
 void
 native_to_svr4_32_sigset(const sigset_t *bss, svr4_32_sigset_t *sss)
+{
 	int i, newsig;
 	svr4_sigemptyset(sss);
 	for (i = 1; i < NSIG; i++) {
 		if (sigismember(bss, i)) {
 			newsig = native_to_svr4_signo[i];
 			if (newsig)
 				svr4_sigaddset(sss, newsig);
+		}
+	}
+}
 /*
  * XXX: Only a subset of the flags is currently implemented.
  */
 void
 svr4_32_to_native_sigaction(const struct svr4_32_sigaction *ssa, struct sigaction *bsa)
+{
 	bsa->sa_handler = NETBSD32PTR64(ssa->svr4_32_sa_handler);
 	svr4_32_to_native_sigset(&ssa->svr4_32_sa_mask, &bsa->sa_mask);
 	bsa->sa_flags = 0;
 	if ((ssa->svr4_32_sa_flags & SVR4_SA_ONSTACK) != 0)
 		bsa->sa_flags |= SA_ONSTACK;
 	if ((ssa->svr4_32_sa_flags & SVR4_SA_RESETHAND) != 0)
 		bsa->sa_flags |= SA_RESETHAND;
 	if ((ssa->svr4_32_sa_flags & SVR4_SA_RESTART) != 0)
 		bsa->sa_flags |= SA_RESTART;
 	if ((ssa->svr4_32_sa_flags & SVR4_SA_SIGINFO) != 0) {
 		DPRINTF(("svr4_to_native_sigaction: SA_SIGINFO ignored\n"));
+	}
 	if ((ssa->svr4_32_sa_flags & SVR4_SA_NODEFER) != 0)
 		bsa->sa_flags |= SA_NODEFER;
 	if ((ssa->svr4_32_sa_flags & SVR4_SA_NOCLDWAIT) != 0)
 		bsa->sa_flags |= SA_NOCLDWAIT;
 	if ((ssa->svr4_32_sa_flags & SVR4_SA_NOCLDSTOP) != 0)
 		bsa->sa_flags |= SA_NOCLDSTOP;
 	if ((ssa->svr4_32_sa_flags & ~SVR4_SA_ALLBITS) != 0) {
 		DPRINTF(("svr4_32_to_native_sigaction: extra bits %x ignored\n",
 		    ssa->svr4_32_sa_flags & ~SVR4_SA_ALLBITS));
+	}
+}
 void
 native_to_svr4_32_sigaction(const struct sigaction *bsa, struct svr4_32_sigaction *ssa)
+{
 	NETBSD32PTR32(ssa->svr4_32_sa_handler, bsa->sa_handler);
 	native_to_svr4_32_sigset(&bsa->sa_mask, &ssa->svr4_32_sa_mask);
 	ssa->svr4_32_sa_flags = 0;
 	if ((bsa->sa_flags & SA_ONSTACK) != 0)
 		ssa->svr4_32_sa_flags |= SVR4_SA_ONSTACK;
 	if ((bsa->sa_flags & SA_RESETHAND) != 0)
 		ssa->svr4_32_sa_flags |= SVR4_SA_RESETHAND;
 	if ((bsa->sa_flags & SA_RESTART) != 0)
 		ssa->svr4_32_sa_flags |= SVR4_SA_RESTART;
 	if ((bsa->sa_flags & SA_NODEFER) != 0)
 		ssa->svr4_32_sa_flags |= SVR4_SA_NODEFER;
 	if ((bsa->sa_flags & SA_NOCLDSTOP) != 0)
 		ssa->svr4_32_sa_flags |= SVR4_SA_NOCLDSTOP;
+}
 int
 svr4_32_sys_sigaction(struct lwp *l, const struct svr4_32_sys_sigaction_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) signum;
 		syscallarg(const struct svr4_32_sigaction *) nsa;
 		syscallarg(struct svr4_32_sigaction *) osa;
 	} */
 	struct svr4_32_sigaction nssa, ossa;
 	struct sigaction nbsa, obsa;
 	int native_signo;
 	int error;
 	if (SCARG_P32(uap, nsa)) {
 		error = copyin(SCARG_P32(uap, nsa),
 			       &nssa, sizeof(nssa));
 		if (error)
 			return (error);
 		svr4_32_to_native_sigaction(&nssa, &nbsa);
+	}
 	error = sigaction1(l,
-			   svr4_to_native_signo[SVR4_SIGNO(SCARG(uap, signum))],
+	error = svr4_32_decode_signum(SCARG(uap, signum), &native_signo, NULL);
 	if (error)
 		return error;
 	error = sigaction1(l, native_signo,
 	    SCARG_P32(uap, nsa) ? &nbsa : 0, SCARG_P32(uap, osa) ? &obsa : 0,
 	    NULL, 0);
 	if (error)
 		return (error);
 	if (SCARG_P32(uap, osa)) {
 		native_to_svr4_32_sigaction(&obsa, &ossa);
 		error = copyout(&ossa, SCARG_P32(uap, osa),
 				sizeof(ossa));
 		if (error)
 			return (error);
+	}
 	return (0);
+}
 int
 svr4_32_sys_sigaltstack(struct lwp *l, const struct svr4_32_sys_sigaltstack_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const struct svr4_32_sigaltstack_tp) nss;
 		syscallarg(struct svr4_32_sigaltstack_tp) oss;
 	} */
 	compat_sigaltstack(uap, svr4_32_sigaltstack,
 	    SVR4_SS_ONSTACK, SVR4_SS_DISABLE);
+}
 /*
  * Stolen from the ibcs2 one
  */
 int
 svr4_32_sys_signal(struct lwp *l, const struct svr4_32_sys_signal_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) signum;
 		syscallarg(svr4_32_sig_t) handler;
 	} */
 	struct proc *p = l->l_proc;
-	int signum = svr4_to_native_signo[SVR4_SIGNO(SCARG(uap, signum))];
+	int native_signo, sigcall;
 	struct sigaction nbsa, obsa;
 	sigset_t ss;
 	int error;
-	if (signum <= 0 || signum >= SVR4_NSIG)
+	error = svr4_32_decode_signum(SCARG(uap, signum), &native_signo,
-		return (EINVAL);
+	    &sigcall);
 	if (error)
 		return error;
-	switch (SVR4_SIGCALL(SCARG(uap, signum))) {
+	switch (sigcall) {
 	case SVR4_SIGDEFER_MASK:
 		if (SCARG(uap, handler) == SVR4_SIG_HOLD)
 			goto sighold;
 		/* FALLTHROUGH */
 	case SVR4_SIGNAL_MASK:
 		nbsa.sa_handler = (sig_t)SCARG(uap, handler);
 		sigemptyset(&nbsa.sa_mask);
 		nbsa.sa_flags = 0;
 		error = sigaction1(l, signum, &nbsa, &obsa, NULL, 0);
 		if (error)
 			return (error);
 		*retval = (u_int)(u_long)obsa.sa_handler;
 		return (0);
 	case SVR4_SIGHOLD_MASK:
 	sighold:
 		sigemptyset(&ss);
 		sigaddset(&ss, signum);
 		mutex_enter(p->p_lock);
 		error = sigprocmask1(l, SIG_BLOCK, &ss, 0);
 		mutex_exit(p->p_lock);
 		return error;
 	case SVR4_SIGRELSE_MASK:
 		sigemptyset(&ss);
 		sigaddset(&ss, signum);
 		mutex_enter(p->p_lock);
 		error = sigprocmask1(l, SIG_UNBLOCK, &ss, 0);
 		mutex_exit(p->p_lock);
 		return error;
 	case SVR4_SIGIGNORE_MASK:
 		nbsa.sa_handler = SIG_IGN;
 		sigemptyset(&nbsa.sa_mask);
 		nbsa.sa_flags = 0;
 		return (sigaction1(l, signum, &nbsa, 0, NULL, 0));
 	case SVR4_SIGPAUSE_MASK:
 		mutex_enter(p->p_lock);
 		ss = l->l_sigmask;
 		mutex_exit(p->p_lock);
 		sigdelset(&ss, signum);
 		return (sigsuspend1(l, &ss));
 	default:
 		return (ENOSYS);
+	}
+}
 int
 svr4_32_sys_sigprocmask(struct lwp *l, const struct svr4_32_sys_sigprocmask_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) how;
 		syscallarg(const svr4_32_sigset_t *) set;
 		syscallarg(svr4_32_sigset_t *) oset;
 	} */
 	struct proc *p = l->l_proc;
 	svr4_32_sigset_t nsss, osss;
 	sigset_t nbss, obss;
 	int how;
 	int error;
 	/*
 	 * Initialize how to 0 to avoid a compiler warning.  Note that
 	 * this is safe because of the check in the default: case.
 	 */
 	how = 0;
 	switch (SCARG(uap, how)) {
 	case SVR4_SIG_BLOCK:
 		how = SIG_BLOCK;
 		break;
 	case SVR4_SIG_UNBLOCK:
 		how = SIG_UNBLOCK;
 		break;
 	case SVR4_SIG_SETMASK:
 		how = SIG_SETMASK;
 		break;
 	default:
 		if (SCARG_P32(uap, set))
 			return EINVAL;
 		break;
+	}
 	if (SCARG_P32(uap, set)) {
 		error = copyin(SCARG_P32(uap, set),
 			       &nsss, sizeof(nsss));
 		if (error)
 			return error;
 		svr4_32_to_native_sigset(&nsss, &nbss);
+	}
 	mutex_enter(p->p_lock);
 	error = sigprocmask1(l, how,
 	    SCARG_P32(uap, set) ? &nbss : NULL, SCARG_P32(uap, oset) ? &obss : NULL);
 	mutex_exit(p->p_lock);
 	if (error)
 		return error;
 	if (SCARG_P32(uap, oset)) {
 		native_to_svr4_32_sigset(&obss, &osss);
 		error = copyout(&osss, SCARG_P32(uap, oset),
 				sizeof(osss));
 		if (error)
 			return error;
+	}
 	return 0;
+}
 int
 svr4_32_sys_sigpending(struct lwp *l, const struct svr4_32_sys_sigpending_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) what;
 		syscallarg(svr4_sigset_t *) set;
 	} */
 	sigset_t bss;
 	svr4_32_sigset_t sss;
 	switch (SCARG(uap, what)) {
 	case 1:	/* sigpending */
 		sigpending1(l, &bss);
 		native_to_svr4_32_sigset(&bss, &sss);
 		break;
 	case 2:	/* sigfillset */
 		svr4_32_sigfillset(&sss);
 		break;
 	default:
 		return (EINVAL);
+	}
 	return (copyout(&sss, SCARG_P32(uap, set), sizeof(sss)));
+}
 int
 svr4_32_sys_sigsuspend(struct lwp *l, const struct svr4_32_sys_sigsuspend_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const svr4_32_sigset_t *) set;
 	} */
 	svr4_32_sigset_t sss;
 	sigset_t bss;
 	int error;
 	if (SCARG_P32(uap, set)) {
 		error = copyin(SCARG_P32(uap, set), &sss, sizeof(sss));
 		if (error)
 			return (error);
 		svr4_32_to_native_sigset(&sss, &bss);
+	}
 	return (sigsuspend1(l, SCARG_P32(uap, set) ? &bss : 0));
+}
 int
 svr4_32_sys_pause(struct lwp *l, const void *v, register_t *retval)
+{
 	return (sigsuspend1(l, 0));
+}
 int
 svr4_32_sys_kill(struct lwp *l, const struct svr4_32_sys_kill_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) pid;
 		syscallarg(int) signum;
 	} */
 	struct sys_kill_args ka;
 	int native_signo;
 	int error;
 	error = svr4_32_decode_signum(SCARG(uap, signum), &native_signo, NULL);
 	if (error)
 		return error;
 	SCARG(&ka, pid) = SCARG(uap, pid);
-	SCARG(&ka, signum) = svr4_to_native_signo[SVR4_SIGNO(SCARG(uap, signum))];
+	SCARG(&ka, signum) = native_signo;
 	return sys_kill(l, &ka, retval);
+}
 void
 svr4_32_getcontext(struct lwp *l, struct svr4_32_ucontext *uc, const sigset_t *mask)
+{
 	void *sp;
 	struct svr4_32_sigaltstack *ss = &uc->uc_stack;
 	memset(uc, 0, sizeof(*uc));
 	/* get machine context */
 	sp = svr4_32_getmcontext(l, &uc->uc_mcontext, &uc->uc_flags);
 	/* get link */
 	NETBSD32PTR32(uc->uc_link, l->l_ctxlink);
 	/* get stack state. XXX: solaris appears to do this */
 #if 0
 	svr4_32_to_native_sigaltstack(&uc->uc_stack, &p->p_sigacts->ps_sigstk);
 #else
 	NETBSD32PTR32(ss->ss_sp, (void *)(((u_long) sp) & ~(16384 - 1)));
 	ss->ss_size = 16384;
 	ss->ss_flags = 0;
 #endif
 	/* get signal mask */
 	mutex_enter(l->l_proc->p_lock);
 	native_to_svr4_32_sigset(mask, &uc->uc_sigmask);
 	mutex_exit(l->l_proc->p_lock);
 	uc->uc_flags |= SVR4_UC_STACK|SVR4_UC_SIGMASK;
+}
 int
 svr4_32_setcontext(struct lwp *l, struct svr4_32_ucontext *uc)
+{
 	int error;
 	struct proc *p = l->l_proc;
 	/* set machine context */
 	if ((error = svr4_32_setmcontext(l, &uc->uc_mcontext, uc->uc_flags)) != 0)
 		return error;
 	/* set link */
 	l->l_ctxlink = NETBSD32PTR64(uc->uc_link);
 	mutex_enter(p->p_lock);
 	/* set signal stack */
 	if (uc->uc_flags & SVR4_UC_STACK) {
 		l->l_sigstk.ss_sp = NETBSD32PTR64(uc->uc_stack.ss_sp);
 		l->l_sigstk.ss_size = uc->uc_stack.ss_size;
 		l->l_sigstk.ss_flags =
 		    (uc->uc_stack.ss_flags & SVR4_SS_ONSTACK ? SS_ONSTACK : 0) |
 		    (uc->uc_stack.ss_flags & SVR4_SS_DISABLE ? SS_DISABLE : 0);
+	}
 	/* set signal mask */
 	if (uc->uc_flags & SVR4_UC_SIGMASK) {
 		sigset_t mask;
 		svr4_32_to_native_sigset(&uc->uc_sigmask, &mask);
 		(void)sigprocmask1(l, SIG_SETMASK, &mask, 0);
+	}
 	mutex_exit(p->p_lock);
 	return EJUSTRETURN;
+}
 int
 svr4_32_sys_context(struct lwp *l, const struct svr4_32_sys_context_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) func;
 		syscallarg(struct svr4_32_ucontext *) uc;
 	} */
 	struct svr4_32_ucontext uc;
 	int error;
 	*retval = 0;
 	switch (SCARG(uap, func)) {
 	case SVR4_GETCONTEXT:
 		DPRINTF(("getcontext(%p)\n", SCARG(uap, uc)));
 		svr4_32_getcontext(l, &uc, &l->l_sigmask);
 		return copyout(&uc, SCARG_P32(uap, uc), sizeof(uc));
 	case SVR4_SETCONTEXT:
 		DPRINTF(("setcontext(%p)\n", SCARG(uap, uc)));
 		if (!SCARG_P32(uap, uc))
 			exit1(l, W_EXITCODE(0, 0));
 		else if ((error = copyin(SCARG_P32(uap, uc),
 					 &uc, sizeof(uc))) != 0)
 			return error;
 		else
 			return svr4_32_setcontext(l, &uc);
 	default:
 		DPRINTF(("context(%d, %p)\n", SCARG(uap, func),
 		    SCARG(uap, uc)));
 		return ENOSYS;
+	}
 	return 0;
+}