 @@ -1,14 +1,14 @@
-/*	$NetBSD: uipc_socket.c,v 1.302 2022/04/09 23:52:22 riastradh Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.302.4.1 2024/02/04 11:20:15 martin Exp $	*/
 /*
  * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of Wasabi Systems, Inc, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -61,27 +61,27 @@
+ *
  *	@(#)uipc_socket.c	8.6 (Berkeley) 5/2/95
  */
 /*
  * Socket operation routines.
+ *
  * These routines are called by the routines in sys_socket.c or from a
  * system process, and implement the semantics of socket operations by
  * switching out to the protocol specific routines.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.302 2022/04/09 23:52:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.302.4.1 2024/02/04 11:20:15 martin Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
 #include "opt_sock_counters.h"
 #include "opt_sosend_loan.h"
 #include "opt_mbuftrace.h"
 #include "opt_somaxkva.h"
 #include "opt_multiprocessor.h"	/* XXX */
 #include "opt_sctp.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 @@ -558,64 +558,71 @@ socreate(int dom, struct socket **aso, i
 		so->so_state |= SS_NOFDREF;
 		sofree(so);
 		return error;
+	}
 	so->so_cred = kauth_cred_dup(l->l_cred);
 	sounlock(so);
 	*aso = so;
 	return 0;
+}
 /*
  * fsocreate: create a socket and a file descriptor associated with it.
  * Returns the allocated file structure in *fpp, but the descriptor
  * is not visible yet for the process.
  * Caller is responsible for calling fd_affix() for the returned *fpp once
  * it's socket initialization is finished successfully, or fd_abort() if it's
  * initialization fails.
+ *
+ *
- * => On success, write file descriptor to fdout and return zero.
+ * => On success, write file descriptor to *fdout and *fpp and return zero.
- * => On failure, return non-zero; *fdout will be undefined.
+ * => On failure, return non-zero; *fdout and *fpp will be undefined.
  */
 int
-fsocreate(int domain, struct socket **sop, int type, int proto, int *fdout)
+fsocreate(int domain, struct socket **sop, int type, int proto, int *fdout,
     file_t **fpp, struct socket *lockso)
+{
 	lwp_t *l = curlwp;
 	int error, fd, flags;
 	struct socket *so;
-	struct file *fp;
+	file_t *fp;
 	flags = type & SOCK_FLAGS_MASK;
 	type &= ~SOCK_FLAGS_MASK;
 	error = socreate(domain, &so, type, proto, l, lockso);
 	if (error) {
 		return error;
+	}
 	if ((error = fd_allocfile(&fp, &fd)) != 0) {
 		soclose(so);
 		return error;
+	}
 	flags = type & SOCK_FLAGS_MASK;
 	fd_set_exclose(l, fd, (flags & SOCK_CLOEXEC) != 0);
 	fp->f_flag = FREAD|FWRITE|((flags & SOCK_NONBLOCK) ? FNONBLOCK : 0)|
 	    ((flags & SOCK_NOSIGPIPE) ? FNOSIGPIPE : 0);
 	fp->f_type = DTYPE_SOCKET;
 	fp->f_ops = &socketops;
 	type &= ~SOCK_FLAGS_MASK;
 	error = socreate(domain, &so, type, proto, l, NULL);
 	if (error) {
 		fd_abort(curproc, fp, fd);
 		return error;
 	if (flags & SOCK_NONBLOCK) {
 		so->so_state |= SS_NBIO;
+	}
 	fp->f_socket = so;
 	fd_affix(curproc, fp, fd);
 	if (sop != NULL) {
 		*sop = so;
+	}
 	*fdout = fd;
 	*fpp = fp;
 	return error;
+}
 int
 sofamily(const struct socket *so)
+{
 	const struct protosw *pr;
 	const struct domain *dom;
 	if ((pr = so->so_proto) == NULL)
 		return AF_UNSPEC;
 	if ((dom = pr->pr_domain) == NULL)
 		return AF_UNSPEC;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uipc_syscalls.c,v 1.206 2022/07/01 22:30:51 riastradh Exp $	*/
+/*	$NetBSD: uipc_syscalls.c,v 1.206.4.1 2024/02/04 11:20:15 martin Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -51,27 +51,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)uipc_syscalls.c	8.6 (Berkeley) 2/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.206 2022/07/01 22:30:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.206.4.1 2024/02/04 11:20:15 martin Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_pipe.h"
 #include "opt_sctp.h"
 #endif
 #define MBUFTYPES
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/buf.h>
 @@ -101,30 +101,32 @@ extern const struct fileops socketops;
 static int	sockargs_sb(struct sockaddr_big *, const void *, socklen_t);
 int
 sys___socket30(struct lwp *l, const struct sys___socket30_args *uap,
     register_t *retval)
+{
 	/* {
 		syscallarg(int)	domain;
 		syscallarg(int)	type;
 		syscallarg(int)	protocol;
 	} */
 	int fd, error;
 	file_t *fp;
 	error = fsocreate(SCARG(uap, domain), NULL, SCARG(uap, type),
-	    SCARG(uap, protocol), &fd);
+	    SCARG(uap, protocol), &fd, &fp, NULL);
 	if (error == 0) {
 		fd_affix(l->l_proc, fp, fd);
 		*retval = fd;
+	}
 	return error;
+}
 int
 sys_bind(struct lwp *l, const struct sys_bind_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int)				s;
 		syscallarg(const struct sockaddr *)	name;
 		syscallarg(unsigned int)		namelen;
 	} */
 @@ -392,83 +394,53 @@ do_sys_connect(struct lwp *l, int fd, st
 		so->so_error = 0;
+	}
  bad:
 	if (!interrupted)
 		so->so_state &= ~SS_ISCONNECTING;
 	if (error == ERESTART)
 		error = EINTR;
  out:
 	sounlock(so);
 	fd_putfile(fd);
 	return error;
+}
 static int
 makesocket(struct lwp *l, file_t **fp, int *fd, int flags, int type,
     int domain, int proto, struct socket *soo)
 	struct socket *so;
 	int error;
 	if ((error = socreate(domain, &so, type, proto, l, soo)) != 0) {
 		return error;
 	if (flags & SOCK_NONBLOCK) {
 		so->so_state |= SS_NBIO;
 	if ((error = fd_allocfile(fp, fd)) != 0) {
 		soclose(so);
 		return error;
 	fd_set_exclose(l, *fd, (flags & SOCK_CLOEXEC) != 0);
 	(*fp)->f_flag = FREAD|FWRITE|
 	    ((flags & SOCK_NONBLOCK) ? FNONBLOCK : 0)|
 	    ((flags & SOCK_NOSIGPIPE) ? FNOSIGPIPE : 0);
 	(*fp)->f_type = DTYPE_SOCKET;
 	(*fp)->f_ops = &socketops;
 	(*fp)->f_socket = so;
 	return 0;
 int
 sys_socketpair(struct lwp *l, const struct sys_socketpair_args *uap,
     register_t *retval)
+{
 	/* {
 		syscallarg(int)		domain;
 		syscallarg(int)		type;
 		syscallarg(int)		protocol;
 		syscallarg(int *)	rsv;
 	} */
 	file_t		*fp1, *fp2;
 	struct socket	*so1, *so2;
 	int		fd, error, sv[2];
 	proc_t		*p = curproc;
 	int		flags = SCARG(uap, type) & SOCK_FLAGS_MASK;
 	int		type = SCARG(uap, type) & ~SOCK_FLAGS_MASK;
 	int		domain = SCARG(uap, domain);
 	int		proto = SCARG(uap, protocol);
-	error = makesocket(l, &fp1, &fd, flags, type, domain, proto, NULL);
+	error = fsocreate(domain, &so1, type|flags, proto, &fd, &fp1, NULL);
 	if (error)
 		return error;
 	so1 = fp1->f_socket;
 	sv[0] = fd;
-	error = makesocket(l, &fp2, &fd, flags, type, domain, proto, so1);
+	error = fsocreate(domain, &so2, type|flags, proto, &fd, &fp2, so1);
 	if (error)
 		goto out;
 	so2 = fp2->f_socket;
 	sv[1] = fd;
 	solock(so1);
 	error = soconnect2(so1, so2);
 	if (error == 0 && type == SOCK_DGRAM) {
 		/*
 		 * Datagram socket connection is asymmetric.
 		 */
 		error = soconnect2(so2, so1);
+	}
 	sounlock(so1);
 	if (error == 0)
 @@ -1287,84 +1259,90 @@ sys_getsockopt2(struct lwp *l, const str
 		syscallarg(void *)		val;
 		syscallarg(unsigned int *)	avalsize;
 	} */
 	return getsockopt(l, (const struct sys_getsockopt_args *) uap, retval, true);
+}
 #ifdef PIPE_SOCKETPAIR
 int
 pipe1(struct lwp *l, int *fildes, int flags)
+{
 	file_t		*rf, *wf;
 	struct socket	*rso, *wso;
-	int		fd, error;
+	int		error, soflags = 0;
-	proc_t		*p;
+	unsigned	rfd, wfd;
 	proc_t		*p = l->l_proc;
 	if (flags & ~(O_CLOEXEC|O_NONBLOCK|O_NOSIGPIPE))
 		return EINVAL;
-	p = curproc;
+	if (flags & O_CLOEXEC)
-	if ((error = socreate(AF_LOCAL, &rso, SOCK_STREAM, 0, l, NULL)) != 0)
+		soflags |= SOCK_CLOEXEC;
-		return error;
+	if (flags & O_NONBLOCK)
-	if ((error = socreate(AF_LOCAL, &wso, SOCK_STREAM, 0, l, rso)) != 0)
+		soflags |= SOCK_NONBLOCK;
 	if (flags & O_NOSIGPIPE)
 		soflags |= SOCK_NOSIGPIPE;
 	error = fsocreate(AF_LOCAL, &rso, SOCK_STREAM|soflags, 0, &rfd, &rf,
 	    NULL);
 	if (error)
 		goto free1;
 	error = fsocreate(AF_LOCAL, &wso, SOCK_STREAM|soflags, 0, &wfd, &wf,
 	    rso);
 	if (error)
 		goto free2;
 	/* make sure the descriptors are uni-directional */
 	rf->f_type = rf->f_type & ~(FWRITE);
 	wf->f_type = wf->f_type & ~(FREAD);
 	/* remember this socket pair implements a pipe */
 	wso->so_state |= SS_ISAPIPE;
 	rso->so_state |= SS_ISAPIPE;
-	if ((error = fd_allocfile(&rf, &fd)) != 0)
+	wso->so_state |= SS_ISAPIPE;
 		goto free2;
 	fildes[0] = fd;
 	rf->f_flag = FREAD | flags;
 	rf->f_type = DTYPE_SOCKET;
 	rf->f_ops = &socketops;
 	rf->f_socket = rso;
 	if ((error = fd_allocfile(&wf, &fd)) != 0)
 		goto free3;
 	wf->f_flag = FWRITE | flags;
 	wf->f_type = DTYPE_SOCKET;
 	wf->f_ops = &socketops;
 	wf->f_socket = wso;
 	fildes[1] = fd;
 	solock(wso);
 	/*
 	 * Pipes must be readable when there is at least 1
 	 * byte of data available in the receive buffer.
+	 *
 	 * Pipes must be writable when there is space for
 	 * at least PIPE_BUF bytes in the send buffer.
 	 * If we're increasing the low water mark for the
 	 * send buffer, then mimic how soreserve() would
 	 * have set the high water mark.
 	 */
 	rso->so_rcv.sb_lowat = 1;
 	if (wso->so_snd.sb_lowat < PIPE_BUF) {
 		wso->so_snd.sb_hiwat = PIPE_BUF * 2;
+	}
 	wso->so_snd.sb_lowat = PIPE_BUF;
 	error = unp_connect2(wso, rso);
 	sounlock(wso);
 	if (error != 0)
-		goto free4;
+		goto free3;
 	fd_affix(p, wf, fildes[1]);
-	fd_affix(p, rf, fildes[0]);
+	fd_affix(p, wf, wfd);
 	fd_affix(p, rf, rfd);
 	fildes[0] = rfd;
 	fildes[1] = wfd;
 	return (0);
  free4:
 	fd_abort(p, wf, fildes[1]);
  free3:
 	fd_abort(p, rf, fildes[0]);
  free2:
 	(void)soclose(wso);
- free1:
+	fd_abort(p, wf, wfd);
  free2:
 	(void)soclose(rso);
 	fd_abort(p, rf, rfd);
  free1:
 	return error;
+}
 #endif /* PIPE_SOCKETPAIR */
 /*
  * Get peer socket name.
  */
 int
 do_sys_getpeername(int fd, struct sockaddr *nam)
+{
 	struct socket	*so;
 	int		error;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_gre.c,v 1.184 2022/09/03 02:47:59 thorpej Exp $ */
+/*	$NetBSD: if_gre.c,v 1.184.4.1 2024/02/04 11:20:15 martin Exp $ */
 /*
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Heiko W.Rupp <hwr@pilhuhn.de>
+ *
  * IPv6-over-GRE contributed by Gert Doering <gert@greenie.muc.de>
+ *
  * GRE over UDP/IPv4/IPv6 sockets contributed by David Young <dyoung@NetBSD.org>
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -35,27 +35,27 @@
  * This material is based upon work partially supported by NSF
  * under Contract No. NSF CNS-0626584.
  */
 /*
  * Encapsulate L3 protocols into IP
  * See RFC 1701 and 1702 for more details.
  * If_gre is compatible with Cisco GRE tunnels, so you can
  * have a NetBSD box as the other end of a tunnel interface of a Cisco
  * router. See gre(4) for more details.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.184 2022/09/03 02:47:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.184.4.1 2024/02/04 11:20:15 martin Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_atalk.h"
 #include "opt_gre.h"
 #include "opt_inet.h"
 #include "opt_mpls.h"
 #endif
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/malloc.h>
 #include <sys/mallocvar.h>
 @@ -425,43 +425,41 @@ gre_upcall_add(struct socket *so, void *
 static void
 gre_upcall_remove(struct socket *so)
+{
 	so->so_rcv.sb_flags &= ~SB_UPCALL;
 	so->so_upcallarg = NULL;
 	so->so_upcall = NULL;
+}
 static int
 gre_socreate(struct gre_softc *sc, const struct gre_soparm *sp, int *fdout)
+{
 	int fd, rc;
 	file_t *fp;
 	struct socket *so;
 	struct sockaddr_big sbig;
 	sa_family_t af;
 	int val;
 	GRE_DPRINTF(sc, "enter\n");
 	af = sp->sp_src.ss_family;
-	rc = fsocreate(af, NULL, sp->sp_type, sp->sp_proto, &fd);
+	rc = fsocreate(af, &so, sp->sp_type, sp->sp_proto, &fd, &fp, NULL);
 	if (rc != 0) {
 		GRE_DPRINTF(sc, "fsocreate failed\n");
 		return rc;
+	}
 	if ((rc = fd_getsock(fd, &so)) != 0)
 		return rc;
 	memcpy(&sbig, &sp->sp_src, sizeof(sp->sp_src));
 	if ((rc = sobind(so, (struct sockaddr *)&sbig, curlwp)) != 0) {
 		GRE_DPRINTF(sc, "sobind failed\n");
 		goto out;
+	}
 	memcpy(&sbig, &sp->sp_dst, sizeof(sp->sp_dst));
 	solock(so);
 	if ((rc = soconnect(so, (struct sockaddr *)&sbig, curlwp)) != 0) {
 		GRE_DPRINTF(sc, "soconnect failed\n");
 		sounlock(so);
 		goto out;
+	}
 @@ -474,30 +472,31 @@ gre_socreate(struct gre_softc *sc, const
   	if (rc != 0) {
  		GRE_DPRINTF(sc, "so_setsockopt ttl failed\n");
   		rc = 0;
+  	}
  	val = 1;
  	rc = so_setsockopt(curlwp, so, SOL_SOCKET, SO_NOHEADER,
 	    &val, sizeof(val));
   	if (rc != 0) {
  		GRE_DPRINTF(sc, "so_setsockopt SO_NOHEADER failed\n");
 		rc = 0;
+	}
 out:
-	if (rc != 0)
+	if (rc != 0) {
-		fd_close(fd);
+		soclose(so);
-	else  {
+		fd_abort(curproc, fp, fd);
-		fd_putfile(fd);
+	} else  {
 		fd_affix(curproc, fp, fd);
 		*fdout = fd;
+	}
 	return rc;
+}
 static int
 gre_sosend(struct socket *so, struct mbuf *top)
+{
 	struct proc	*p;
 	long		space, resid;
 	int		error;
 	struct lwp * const l = curlwp;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: socketvar.h,v 1.165 2022/04/09 23:52:23 riastradh Exp $	*/
+/*	$NetBSD: socketvar.h,v 1.165.4.1 2024/02/04 11:20:15 martin Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -296,27 +296,28 @@ void	soinit1(void);
 void	soinit2(void);
 int	soabort(struct socket *);
 int	soaccept(struct socket *, struct sockaddr *);
 int	sofamily(const struct socket *);
 int	sobind(struct socket *, struct sockaddr *, struct lwp *);
 void	socantrcvmore(struct socket *);
 void	socantsendmore(struct socket *);
 void	soroverflow(struct socket *);
 int	soclose(struct socket *);
 int	soconnect(struct socket *, struct sockaddr *, struct lwp *);
 int	soconnect2(struct socket *, struct socket *);
 int	socreate(int, struct socket **, int, int, struct lwp *,
 		 struct socket *);
-int	fsocreate(int, struct socket **, int, int, int *);
+int	fsocreate(int, struct socket **, int, int, int *, file_t **,
 		struct socket *);
 int	sodisconnect(struct socket *);
 void	sofree(struct socket *);
 int	sogetopt(struct socket *, struct sockopt *);
 void	sohasoutofband(struct socket *);
 void	soisconnected(struct socket *);
 void	soisconnecting(struct socket *);
 void	soisdisconnected(struct socket *);
 void	soisdisconnecting(struct socket *);
 int	solisten(struct socket *, int, struct lwp *);
 struct socket *
 	sonewconn(struct socket *, bool);
 void	soqinsque(struct socket *, struct socket *, int);
 bool	soqremque(struct socket *, int);