From owner-svn-src-stable@FreeBSD.ORG  Tue Aug  5 13:12:09 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@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 6EEC9DB7;
 Tue,  5 Aug 2014 13:12:09 +0000 (UTC)
Received: from mail-gw12.york.ac.uk (mail-gw12.york.ac.uk [144.32.129.162])
 (using TLSv1 with cipher AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3535B28D7;
 Tue,  5 Aug 2014 13:12:09 +0000 (UTC)
Received: from ury.york.ac.uk ([144.32.64.162]:59484)
 by mail-gw12.york.ac.uk with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
 (Exim 4.76) (envelope-from <gavin@FreeBSD.org>)
 id 1XEeX2-0001gy-R2; Tue, 05 Aug 2014 14:12:00 +0100
Date: Tue, 5 Aug 2014 14:12:00 +0100 (BST)
From: Gavin Atkinson <gavin@FreeBSD.org>
X-X-Sender: gavin@ury.york.ac.uk
To: Peter Wemm <peter@FreeBSD.org>
Subject: Re: svn commit: r269490 - stable/10/sys/kern
In-Reply-To: <53debee3.5327.470761ac@svn.freebsd.org>
Message-ID: <alpine.BSF.2.11.1408051409480.4907@ury.york.ac.uk>
References: <53debee3.5327.470761ac@svn.freebsd.org>
User-Agent: Alpine 2.11 (BSF 23 2013-08-11)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, svn-src-stable-10@freebsd.org
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Aug 2014 13:12:09 -0000

On Sun, 3 Aug 2014, Peter Wemm wrote:

> Author: peter
> Date: Sun Aug  3 22:59:47 2014
> New Revision: 269490
> URL: http://svnweb.freebsd.org/changeset/base/269490
> 
> Log:
>   Insta-MFC r269489: partial revert of r262867 which was MFC'ed as r263820.
>   Don't ignore sndbuf/rcvbuf limits for SOCK_DGRAM sockets.  This appears
>   to be an edit error or patch fuzz mismatch.

It looks like the original commit was also merged to stable/9 as r263823, 
though with an incorrect commit message.  It made it into 9.3-RELEASE, I 
I would say that this is an EN candidate.

Gavin


> Modified:
>   stable/10/sys/kern/uipc_usrreq.c
> 
> Modified: stable/10/sys/kern/uipc_usrreq.c
> ==============================================================================
> --- stable/10/sys/kern/uipc_usrreq.c	Sun Aug  3 22:37:21 2014	(r269489)
> +++ stable/10/sys/kern/uipc_usrreq.c	Sun Aug  3 22:59:47 2014	(r269490)
> @@ -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;