From owner-svn-src-all@freebsd.org  Sun Mar 12 05:00:05 2017
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8B4FAD0836F;
 Sun, 12 Mar 2017 05:00:05 +0000 (UTC) (envelope-from kp@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 mx1.freebsd.org (Postfix) with ESMTPS id 5B3021B6D;
 Sun, 12 Mar 2017 05:00:05 +0000 (UTC) (envelope-from kp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2C504e9055296;
 Sun, 12 Mar 2017 05:00:04 GMT (envelope-from kp@FreeBSD.org)
Received: (from kp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2C504fH055295;
 Sun, 12 Mar 2017 05:00:04 GMT (envelope-from kp@FreeBSD.org)
Message-Id: <201703120500.v2C504fH055295@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kp set sender to kp@FreeBSD.org
 using -f
From: Kristof Provost <kp@FreeBSD.org>
Date: Sun, 12 Mar 2017 05:00:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r315131 - head/sys/netpfil/pf
X-SVN-Group: head
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.23
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: Sun, 12 Mar 2017 05:00:05 -0000

Author: kp
Date: Sun Mar 12 05:00:04 2017
New Revision: 315131
URL: https://svnweb.freebsd.org/changeset/base/315131

Log:
  pf: Do not lose the VNET lock when ending the purge thread
  
  When the pf_purge_thread() exits it must make sure to release the
  VNET_LIST_RLOCK it still holds.
  kproc_exit() does not return.

Modified:
  head/sys/netpfil/pf/pf.c

Modified: head/sys/netpfil/pf/pf.c
==============================================================================
--- head/sys/netpfil/pf/pf.c	Sun Mar 12 04:59:02 2017	(r315130)
+++ head/sys/netpfil/pf/pf.c	Sun Mar 12 05:00:04 2017	(r315131)
@@ -1440,6 +1440,7 @@ pf_purge_thread(void *unused __unused)
 			if (pf_end_threads) {
 				pf_end_threads++;
 				wakeup(pf_purge_thread);
+				VNET_LIST_RUNLOCK();
 				kproc_exit(0);
 			}