From owner-svn-src-all@freebsd.org  Thu Jun  7 04:57:41 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A54FDFF6B59;
 Thu,  7 Jun 2018 04:57:41 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 55DF87DA4A;
 Thu,  7 Jun 2018 04:57:41 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 355B91B904;
 Thu,  7 Jun 2018 04:57:41 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w574vf2t078645;
 Thu, 7 Jun 2018 04:57:41 GMT (envelope-from mmacy@FreeBSD.org)
Received: (from mmacy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w574vfKg078644;
 Thu, 7 Jun 2018 04:57:41 GMT (envelope-from mmacy@FreeBSD.org)
Message-Id: <201806070457.w574vfKg078644@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmacy set sender to
 mmacy@FreeBSD.org using -f
From: Matt Macy <mmacy@FreeBSD.org>
Date: Thu, 7 Jun 2018 04:57:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r334756 - head/sys/kern
X-SVN-Group: head
X-SVN-Commit-Author: mmacy
X-SVN-Commit-Paths: head/sys/kern
X-SVN-Commit-Revision: 334756
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jun 2018 04:57:41 -0000

Author: mmacy
Date: Thu Jun  7 04:57:40 2018
New Revision: 334756
URL: https://svnweb.freebsd.org/changeset/base/334756

Log:
  AF_UNIX: check for unp == unp2 on disconnect

Modified:
  head/sys/kern/uipc_usrreq.c

Modified: head/sys/kern/uipc_usrreq.c
==============================================================================
--- head/sys/kern/uipc_usrreq.c	Thu Jun  7 04:03:19 2018	(r334755)
+++ head/sys/kern/uipc_usrreq.c	Thu Jun  7 04:57:40 2018	(r334756)
@@ -872,21 +872,19 @@ uipc_disconnect(struct socket *so)
 		UNP_PCB_UNLOCK(unp);
 		return (0);
 	}
-	if (unp == unp2) {
-		if (unp_pcb_rele(unp) == 0)
+	if (__predict_true(unp != unp2)) {
+		unp_pcb_owned_lock2(unp, unp2, freed);
+		if (__predict_false(freed)) {
 			UNP_PCB_UNLOCK(unp);
+			return (0);
+		}
+		unp_pcb_hold(unp2);
 	}
-	unp_pcb_owned_lock2(unp, unp2, freed);
-	if (__predict_false(freed)) {
-		UNP_PCB_UNLOCK(unp);
-		return (0);
-	}
-	unp_pcb_hold(unp2);
 	unp_pcb_hold(unp);
 	unp_disconnect(unp, unp2);
 	if (unp_pcb_rele(unp) == 0)
 		UNP_PCB_UNLOCK(unp);
-	if (unp_pcb_rele(unp2) == 0)
+	if ((unp != unp2) && unp_pcb_rele(unp2) == 0)
 		UNP_PCB_UNLOCK(unp2);
 	return (0);
 }