Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 Jul 2019 17:43:45 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r349811 - stable/11/sys/kern
Message-ID:  <201907071743.x67HhjR0043302@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: markj
Date: Sun Jul  7 17:43:45 2019
New Revision: 349811
URL: https://svnweb.freebsd.org/changeset/base/349811

Log:
  MFC r349599:
  Fix handling of errors from sblock() in soreceive_stream().
  
  PR:	238789

Modified:
  stable/11/sys/kern/uipc_socket.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/kern/uipc_socket.c
==============================================================================
--- stable/11/sys/kern/uipc_socket.c	Sun Jul  7 17:43:15 2019	(r349810)
+++ stable/11/sys/kern/uipc_socket.c	Sun Jul  7 17:43:45 2019	(r349811)
@@ -1969,7 +1969,7 @@ soreceive_stream(struct socket *so, struct sockaddr **
 	/* Prevent other readers from entering the socket. */
 	error = sblock(sb, SBLOCKWAIT(flags));
 	if (error)
-		goto out;
+		return (error);
 	SOCKBUF_LOCK(sb);
 
 	/* Easy one, no space to copyout anything. */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907071743.x67HhjR0043302>