Author: gavin
Date: Sun Aug 10 21:17:19 2014
New Revision: 269789
URL: http://svnweb.freebsd.org/changeset/base/269789

Log:
  Merge r269489 from head (by peter):
  
    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:
  stable/9/sys/kern/uipc_usrreq.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/uipc_usrreq.c
==============================================================================
--- stable/9/sys/kern/uipc_usrreq.c     Sun Aug 10 20:05:13 2014        
(r269788)
+++ stable/9/sys/kern/uipc_usrreq.c     Sun Aug 10 21:17:19 2014        
(r269789)
@@ -876,7 +876,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;
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"

Reply via email to