Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Jan 2016 17:27:23 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r293427 - head/sys/kern
Message-ID:  <201601081727.u08HRNmw018062@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glebius
Date: Fri Jan  8 17:27:23 2016
New Revision: 293427
URL: https://svnweb.freebsd.org/changeset/base/293427

Log:
  Revert r293405: it breaks socket buffer INVARIANTS when sending control
  data over local sockets.

Modified:
  head/sys/kern/uipc_usrreq.c

Modified: head/sys/kern/uipc_usrreq.c
==============================================================================
--- head/sys/kern/uipc_usrreq.c	Fri Jan  8 16:50:04 2016	(r293426)
+++ head/sys/kern/uipc_usrreq.c	Fri Jan  8 17:27:23 2016	(r293427)
@@ -981,7 +981,7 @@ uipc_send(struct socket *so, int flags, 
 				    control))
 					control = NULL;
 			} else
-				sbappendstream_locked(&so2->so_rcv, m, flags);
+				sbappend_locked(&so2->so_rcv, m);
 			break;
 
 		case SOCK_SEQPACKET: {



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