svn commit: r312677 - stable/11/sys/netpfil/ipfw

[Andrey V. Elsukov]

Author: ae
Date: Tue Jan 24 00:38:35 2017
New Revision: 312677
URL: https://svnweb.freebsd.org/changeset/base/312677

Log:
  MFC r312341:
    Initialize IPFW static rules rmlock with RM_RECURSE flag.
  
    This lock was replaced from rwlock in r272840. But unlike rwlock, rmlock
    doesn't allow recursion on rm_rlock(), so at this time fix this with
    RM_RECURSE flag. Later we need to change ipfw to avoid such recursions.
  
    PR:		216171

Modified:
  stable/11/sys/netpfil/ipfw/ip_fw_private.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netpfil/ipfw/ip_fw_private.h
==============================================================================
--- stable/11/sys/netpfil/ipfw/ip_fw_private.h	Tue Jan 24 00:36:46 2017	(r312676)
+++ stable/11/sys/netpfil/ipfw/ip_fw_private.h	Tue Jan 24 00:38:35 2017	(r312677)
@@ -412,7 +412,7 @@ struct ipfw_ifc {
 #define	IPFW_PF_RUNLOCK(p)		IPFW_RUNLOCK(p)
 #else /* FreeBSD */
 #define	IPFW_LOCK_INIT(_chain) do {			\
-	rm_init(&(_chain)->rwmtx, "IPFW static rules");	\
+	rm_init_flags(&(_chain)->rwmtx, "IPFW static rules", RM_RECURSE); \
 	rw_init(&(_chain)->uh_lock, "IPFW UH lock");	\
 	} while (0)