From owner-svn-src-all@FreeBSD.ORG  Thu Apr 30 21:51:12 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E78E6876;
 Thu, 30 Apr 2015 21:51:12 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 D597A11FD;
 Thu, 30 Apr 2015 21:51:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3ULpCdu080446;
 Thu, 30 Apr 2015 21:51:12 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3ULpC7M080445;
 Thu, 30 Apr 2015 21:51:12 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201504302151.t3ULpC7M080445@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
 melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Thu, 30 Apr 2015 21:51:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282286 - head/sys/netpfil/ipfw
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.20
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Apr 2015 21:51:13 -0000

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)