Author: markj
Date: Sun Jul  7 17:43:15 2019
New Revision: 349810
URL: https://svnweb.freebsd.org/changeset/base/349810

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

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

Modified: stable/12/sys/kern/uipc_socket.c
==============================================================================
--- stable/12/sys/kern/uipc_socket.c    Sun Jul  7 17:31:13 2019        
(r349809)
+++ stable/12/sys/kern/uipc_socket.c    Sun Jul  7 17:43:15 2019        
(r349810)
@@ -2196,7 +2196,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. */
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to