 @@ -1,14 +1,14 @@
-/*	$NetBSD: uipc_socket.c,v 1.263 2018/04/26 19:50:09 maxv Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.264 2018/06/06 09:46:46 roy 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.263 2018/04/26 19:50:09 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.264 2018/06/06 09:46:46 roy 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>
 @@ -1230,31 +1230,36 @@ soreceive(struct socket *so, struct mbuf
 	 * a short count if a timeout or signal occurs after we start.
 	 */
 	if (m == NULL ||
 	    ((flags & MSG_DONTWAIT) == 0 &&
 	     so->so_rcv.sb_cc < uio->uio_resid &&
 	     (so->so_rcv.sb_cc < so->so_rcv.sb_lowat ||
 	      ((flags & MSG_WAITALL) &&
 	       uio->uio_resid <= so->so_rcv.sb_hiwat)) &&
 	     m->m_nextpkt == NULL && !atomic)) {
 #ifdef DIAGNOSTIC
 		if (m == NULL && so->so_rcv.sb_cc)
 			panic("receive 1");
 #endif
-		if (so->so_error) {
+		if (so->so_error || so->so_rerror) {
 			if (m != NULL)
 				goto dontblock;
-			error = so->so_error;
+			if (so->so_error) {
-			so->so_error = 0;
+				error = so->so_error;
 				so->so_error = 0;
 			} else {
 				error = so->so_rerror;
 				so->so_rerror = 0;
+			}
 			goto release;
+		}
 		if (so->so_state & SS_CANTRCVMORE) {
 			if (m != NULL)
 				goto dontblock;
 			else
 				goto release;
+		}
 		for (; m != NULL; m = m->m_next)
 			if (m->m_type == MT_OOBDATA  || (m->m_flags & M_EOR)) {
 				m = so->so_rcv.sb_mb;
 				goto dontblock;
+			}
 @@ -1554,27 +1559,28 @@ soreceive(struct socket *so, struct mbuf
+			}
+		}
 		if (flags & MSG_EOR)
 			break;
 		/*
 		 * If the MSG_WAITALL flag is set (for non-atomic socket),
 		 * we must not quit until "uio->uio_resid == 0" or an error
 		 * termination.  If a signal/timeout occurs, return
 		 * with a short count but without error.
 		 * Keep sockbuf locked against other readers.
 		 */
 		while (flags & MSG_WAITALL && m == NULL && uio->uio_resid > 0 &&
 		    !sosendallatonce(so) && !nextrecord) {
-			if (so->so_error || so->so_state & SS_CANTRCVMORE)
+			if (so->so_error || so->so_rerror ||
 			    so->so_state & SS_CANTRCVMORE)
 				break;
 			/*
 			 * If we are peeking and the socket receive buffer is
 			 * full, stop since we can't get more data to peek at.
 			 */
 			if ((flags & MSG_PEEK) && sbspace(&so->so_rcv) <= 0)
 				break;
 			/*
 			 * If we've drained the socket buffer, tell the
 			 * protocol in case it needs to do something to
 			 * get it filled again.
 			 */
 			if ((pr->pr_flags & PR_WANTRCVD) && so->so_pcb)
 @@ -2240,27 +2246,27 @@ static int
 filt_soread(struct knote *kn, long hint)
+{
 	struct socket	*so;
 	int rv;
 	so = ((file_t *)kn->kn_obj)->f_socket;
 	if (hint != NOTE_SUBMIT)
 		solock(so);
 	kn->kn_data = so->so_rcv.sb_cc;
 	if (so->so_state & SS_CANTRCVMORE) {
 		kn->kn_flags |= EV_EOF;
 		kn->kn_fflags = so->so_error;
 		rv = 1;
-	} else if (so->so_error)
+	} else if (so->so_error || so->so_rerror)
 		rv = 1;
 	else if (kn->kn_sfflags & NOTE_LOWAT)
 		rv = (kn->kn_data >= kn->kn_sdata);
 	else
 		rv = (kn->kn_data >= so->so_rcv.sb_lowat);
 	if (hint != NOTE_SUBMIT)
 		sounlock(so);
 	return rv;
+}
 static void
 filt_sowdetach(struct knote *kn)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uipc_socket2.c,v 1.129 2018/04/29 07:13:10 maxv Exp $	*/
+/*	$NetBSD: uipc_socket2.c,v 1.130 2018/06/06 09:46:46 roy Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * 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.
 @@ -48,27 +48,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_socket2.c	8.2 (Berkeley) 2/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.129 2018/04/29 07:13:10 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.130 2018/06/06 09:46:46 roy Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_mbuftrace.h"
 #include "opt_sb_max.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/buf.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 @@ -494,27 +494,27 @@ socantrcvmore(struct socket *so)
 	sorwakeup(so);
+}
 /*
  * soroverflow(): indicates that data was attempted to be sent
  * but the receiving buffer overflowed.
  */
 void
 soroverflow(struct socket *so)
+{
 	KASSERT(solocked(so));
 	so->so_rcv.sb_overflowed++;
-	so->so_error = ENOBUFS;
+	so->so_rerror = ENOBUFS;
 	sorwakeup(so);
+}
 /*
  * Wait for data to arrive at/drain from a socket buffer.
  */
 int
 sbwait(struct sockbuf *sb)
+{
 	struct socket *so;
 	kmutex_t *lock;
 	int error;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: socketvar.h,v 1.155 2018/05/04 08:35:07 christos Exp $	*/
+/*	$NetBSD: socketvar.h,v 1.156 2018/06/06 09:46:46 roy 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.
 @@ -150,26 +150,27 @@ struct socket {
  * We allow connections to queue up based on current queue lengths
  * and limit on number of queued connections for this socket.
  */
 	struct socket	*so_head;	/* back pointer to accept socket */
 	struct soqhead	*so_onq;	/* queue (q or q0) that we're on */
 	struct soqhead	so_q0;		/* queue of partial connections */
 	struct soqhead	so_q;		/* queue of incoming connections */
 	TAILQ_ENTRY(socket) so_qe;	/* our queue entry (q or q0) */
 	short		so_q0len;	/* partials on so_q0 */
 	short		so_qlen;	/* number of connections on so_q */
 	short		so_qlimit;	/* max number queued connections */
 	short		so_timeo;	/* connection timeout */
 	u_short		so_error;	/* error affecting connection */
 	u_short		so_rerror;	/* error affecting receiving */
 	u_short		so_aborting;	/* references from soabort() */
 	pid_t		so_pgid;	/* pgid for signals */
 	u_long		so_oobmark;	/* chars to oob mark */
 	struct sockbuf	so_snd;		/* send buffer */
 	struct sockbuf	so_rcv;		/* receive buffer */
 	void		*so_internal;	/* Space for svr4 stream data */
 	void		(*so_upcall) (struct socket *, void *, int, int);
 	void *		so_upcallarg;	/* Arg for above */
 	int		(*so_send) (struct socket *, struct sockaddr *,
 					struct uio *, struct mbuf *,
 					struct mbuf *, int, struct lwp *);
 	int		(*so_receive) (struct socket *,