Date: Sun, 3 Aug 2014 22:37:21 +0000 (UTC) From: Peter Wemm <peter@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r269489 - head/sys/kern Message-ID: <53deb9a1.5b0e.3d442ab2@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53deb9a1.5b0e.3d442ab2>