From owner-svn-src-head@FreeBSD.ORG Tue Nov 27 22:35:49 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 17D0B76D; Tue, 27 Nov 2012 22:35:49 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id F1B558FC16; Tue, 27 Nov 2012 22:35:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qARMZmor074348; Tue, 27 Nov 2012 22:35:48 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qARMZmji074347; Tue, 27 Nov 2012 22:35:48 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201211272235.qARMZmji074347@svn.freebsd.org> From: Andre Oppermann Date: Tue, 27 Nov 2012 22:35:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r243638 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2012 22:35:49 -0000 Author: andre Date: Tue Nov 27 22:35:48 2012 New Revision: 243638 URL: http://svnweb.freebsd.org/changeset/base/243638 Log: Fix r243627 by testing against the head socket instead of the socket just created. MFC after: 1 week X-MFC-with: r243627 Modified: head/sys/kern/uipc_socket.c Modified: head/sys/kern/uipc_socket.c ============================================================================== --- head/sys/kern/uipc_socket.c Tue Nov 27 22:34:46 2012 (r243637) +++ head/sys/kern/uipc_socket.c Tue Nov 27 22:35:48 2012 (r243638) @@ -556,7 +556,7 @@ sonewconn(struct socket *head, int conns * The accept socket may be tearing down but we just * won a race on the ACCEPT_LOCK. */ - if (!(so->so_options & SO_ACCEPTCONN)) { + if (!(head->so_options & SO_ACCEPTCONN)) { SOCK_LOCK(so); so->so_head = NULL; sofree(so); /* NB: returns ACCEPT_UNLOCK'ed. */