svn commit: r312341 - head/sys/netpfil/ipfw

[Andrey V. Elsukov]

Author: ae
Date: Tue Jan 17 10:50:28 2017
New Revision: 312341
URL: https://svnweb.freebsd.org/changeset/base/312341

Log:
  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
  Reported by:	Eugene Grosbein
  MFC after:	1 week

Modified:
  head/sys/netpfil/ipfw/ip_fw_private.h

Modified: head/sys/netpfil/ipfw/ip_fw_private.h
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_private.h	Tue Jan 17 10:34:31 2017	(r312340)
+++ head/sys/netpfil/ipfw/ip_fw_private.h	Tue Jan 17 10:50:28 2017	(r312341)
@@ -414,7 +414,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)