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

Alexander V. Chernikov melifaro at FreeBSD.org
Thu Apr 30 21:51:13 UTC 2015


Author: melifaro
Date: Thu Apr 30 21:51:12 2015
New Revision: 282286
URL: https://svnweb.freebsd.org/changeset/base/282286

Log:
  Fix KASSERT introduced in r282155.
  
  Found by:	dhw

Modified:
  head/sys/netpfil/ipfw/ip_fw_table.c

Modified: head/sys/netpfil/ipfw/ip_fw_table.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_table.c	Thu Apr 30 21:30:33 2015	(r282285)
+++ head/sys/netpfil/ipfw/ip_fw_table.c	Thu Apr 30 21:51:12 2015	(r282286)
@@ -3399,9 +3399,10 @@ ref_rule_objects(struct ip_fw_chain *ch,
 
 	IPFW_UH_WUNLOCK(ch);
 
-	KASSERT(found + unresolved == ci->object_opcodes,
-	    ("refcount incosistency: found: %d unr: %d total: %d",
-	    found, unresolved, ci->object_opcodes));
+	found = pidx - oib;
+	KASSERT(found == ci->object_opcodes,
+	    ("refcount inconsistency: found: %d total: %d",
+	    found, ci->object_opcodes));
 
 	/* Perform auto-creation for non-existing objects */
 	if (numnew != 0)


More information about the svn-src-all mailing list