From owner-svn-src-all@freebsd.org  Wed Dec  4 22:41:53 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6DC0E1B0F11;
 Wed,  4 Dec 2019 22:41:53 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 47Sv3j2Fv1z4RqH;
 Wed,  4 Dec 2019 22:41:53 +0000 (UTC)
 (envelope-from glebius@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 30BD87670;
 Wed,  4 Dec 2019 22:41:53 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB4Mfrnf059747;
 Wed, 4 Dec 2019 22:41:53 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB4MfrFY059723;
 Wed, 4 Dec 2019 22:41:53 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201912042241.xB4MfrFY059723@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Wed, 4 Dec 2019 22:41:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r355405 - head/sys/netinet
X-SVN-Group: head
X-SVN-Commit-Author: glebius
X-SVN-Commit-Paths: head/sys/netinet
X-SVN-Commit-Revision: 355405
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.29
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: Wed, 04 Dec 2019 22:41:53 -0000

Author: glebius
Date: Wed Dec  4 22:41:52 2019
New Revision: 355405
URL: https://svnweb.freebsd.org/changeset/base/355405

Log:
  Fix regression from r354484.  Don't leak pcb lock if cr_canseeinpcb()
  returns non-zero.
  
  PR:		242415

Modified:
  head/sys/netinet/tcp_subr.c

Modified: head/sys/netinet/tcp_subr.c
==============================================================================
--- head/sys/netinet/tcp_subr.c	Wed Dec  4 21:26:03 2019	(r355404)
+++ head/sys/netinet/tcp_subr.c	Wed Dec  4 22:41:52 2019	(r355405)
@@ -2204,9 +2204,11 @@ tcp_pcblist(SYSCTL_HANDLER_ARGS)
 				error = SYSCTL_OUT(req, &xt, sizeof xt);
 				if (error)
 					break;
+				else
+					continue;
 			}
-		} else
-			INP_RUNLOCK(inp);
+		}
+		INP_RUNLOCK(inp);
 	}
 	NET_EPOCH_EXIT(et);