svn commit: r315469 - head/sys/netpfil/pf

[Kristof Provost]

Author: kp
Date: Sat Mar 18 01:37:20 2017
New Revision: 315469
URL: https://svnweb.freebsd.org/changeset/base/315469

Log:
  pf: Fix memory leak on vnet shutdown or unload
  
  Rules are unlinked in shutdown_pf(), so we must call
  pf_unload_vnet_purge(), which frees unlinked rules, after that, not
  before.
  
  Reviewed by:	eri, bz
  Differential Revision:	https://reviews.freebsd.org/D10040

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

Modified: head/sys/netpfil/pf/pf_ioctl.c
==============================================================================
--- head/sys/netpfil/pf/pf_ioctl.c	Sat Mar 18 00:53:24 2017	(r315468)
+++ head/sys/netpfil/pf/pf_ioctl.c	Sat Mar 18 01:37:20 2017	(r315469)
@@ -3766,12 +3766,12 @@ pf_unload_vnet(void)
 		return;
 	}
 
-	pf_unload_vnet_purge();
-
 	PF_RULES_WLOCK();
 	shutdown_pf();
 	PF_RULES_WUNLOCK();
 
+	pf_unload_vnet_purge();
+
 	pf_normalize_cleanup();
 	PF_RULES_WLOCK();
 	pfi_cleanup_vnet();