From owner-svn-src-stable-9@FreeBSD.ORG  Sun Aug 10 21:17:20 2014
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 82417847
 for <svn-src-stable-9@freebsd.org>; Sun, 10 Aug 2014 21:17:20 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5766020A2
 for <svn-src-stable-9@freebsd.org>; Sun, 10 Aug 2014 21:17:20 +0000 (UTC)
Received: from gavin (uid 1136) (envelope-from gavin@FreeBSD.org) id 27d1
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Sun, 10 Aug 2014 21:17:20 +0000
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Sun, 10 Aug 2014 21:17:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r269789 - stable/9/sys/kern
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e7e160.27d1.6ba150cc@svn.freebsd.org>
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9/>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Aug 2014 21:17:20 -0000

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;