svn commit: r269489 - head/sys/kern

[Peter Wemm]

Author: peter
Date: Sun Aug  3 22:37:21 2014
New Revision: 269489
URL: http://svnweb.freebsd.org/changeset/base/269489

Log:
  Partial revert of r262867.
  
  r262867 was described as fixing socket buffer checks for SOCK_SEQPACKET,
  but also changed one of the SOCK_DGRAM code paths to use the new
  sbappendaddr_nospacecheck_locked() function.  This lead to SOCK_DGRAM
  bypassing socket buffer limits.

Modified:
  head/sys/kern/uipc_usrreq.c

Modified: head/sys/kern/uipc_usrreq.c
==============================================================================
--- head/sys/kern/uipc_usrreq.c	Sun Aug  3 21:56:53 2014	(r269488)
+++ head/sys/kern/uipc_usrreq.c	Sun Aug  3 22:37:21 2014	(r269489)
@@ -897,7 +897,7 @@ uipc_send(struct socket *so, int flags, 
 			from = &sun_noname;
 		so2 = unp2->unp_socket;
 		SOCKBUF_LOCK(&so2->so_rcv);
-		if (sbappendaddr_nospacecheck_locked(&so2->so_rcv, from, m,
+		if (sbappendaddr_locked(&so2->so_rcv, from, m,
 		    control)) {
 			sorwakeup_locked(so2);
 			m = NULL;