 @@ -1,14 +1,14 @@
-/*	$NetBSD: svr4_lwp.c,v 1.19 2009/11/23 00:46:07 rmind Exp $	*/
+/*	$NetBSD: svr4_lwp.c,v 1.19.32.1 2017/08/19 03:40:48 snj Exp $	*/
 /*-
  * Copyright (c) 1999 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.
 @@ -20,27 +20,27 @@
  * ``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_lwp.c,v 1.19 2009/11/23 00:46:07 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_lwp.c,v 1.19.32.1 2017/08/19 03:40:48 snj Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
 #include <sys/mbuf.h>
 #include <sys/file.h>
 #include <sys/mount.h>
 #include <sys/time.h>
 #include <sys/resourcevar.h>
 #include <sys/proc.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 @@ -98,26 +98,28 @@ svr4_sys__lwp_kill(struct lwp *l, const
 	struct sys__lwp_kill_args ap;
 	SCARG(&ap, target) = SCARG(uap, lwpid);
 	SCARG(&ap, signo) = SCARG(uap, signum);
 	return sys__lwp_kill(l, &ap, retval);
+}
 int
 svr4_sys__lwp_info(struct lwp *l, const struct svr4_sys__lwp_info_args *uap, register_t *retval)
+{
 	struct svr4_lwpinfo lwpinfo;
 	int error;
 	memset(&lwpinfo, 0, sizeof(lwpinfo));
 	/* XXX NJWLWP */
 	TIMEVAL_TO_TIMESPEC(&l->l_proc->p_stats->p_ru.ru_stime, &lwpinfo.lwp_stime);
 	TIMEVAL_TO_TIMESPEC(&l->l_proc->p_stats->p_ru.ru_utime, &lwpinfo.lwp_utime);
 	if ((error = copyout(&lwpinfo, SCARG(uap, lwpinfo), sizeof(lwpinfo))) ==
 	    -1)
 	       return error;
 	return 0;
+}
 int
 svr4_sys__lwp_exit(struct lwp *l, const void *v, register_t *retval)
+{

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -20,27 +20,27 @@
  * ``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>
 @@ -63,26 +63,41 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_signal.
 #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)
 @@ -164,35 +179,41 @@ native_to_svr4_sigaction(const struct si
 		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);
+}
 @@ -207,77 +228,79 @@ svr4_sys_sigaltstack(struct lwp *l, cons
 	    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;
 @@ -383,29 +406,35 @@ svr4_sys_pause(struct lwp *l, const void
+{
 	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;
 	/*

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -29,27 +29,27 @@
  * 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>
 @@ -516,31 +516,37 @@ si_sockparams(file_t *fp, int fd, struct
 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;
 @@ -706,27 +712,29 @@ sockmod(file_t *fp, int fd, struct svr4_
+	}
+}
 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;
 @@ -752,58 +760,70 @@ ti_bind(file_t *fp, int fd, struct svr4_
 	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;
 @@ -1410,35 +1430,43 @@ svr4_sys_putmsg(struct lwp *l, const str
 			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
 @@ -1463,28 +1491,31 @@ svr4_sys_putmsg(struct lwp *l, const str
 		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;
 @@ -1492,30 +1523,32 @@ svr4_sys_putmsg(struct lwp *l, const str
 		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;
 @@ -1726,28 +1759,36 @@ svr4_sys_getmsg(struct lwp *l, const str
 		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);

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -20,27 +20,27 @@
  * ``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>
 @@ -198,26 +198,41 @@ const int svr4_to_native_signo[SVR4_NSIG
 	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)
 @@ -300,37 +315,42 @@ native_to_svr4_32_sigaction(const struct
 		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);
+}
 @@ -347,35 +367,37 @@ svr4_32_sys_sigaltstack(struct lwp *l, c
+}
 /*
  * 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;
 @@ -526,29 +548,35 @@ svr4_32_sys_pause(struct lwp *l, const v
+{
 	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);