svn commit: r289480 - head/sys/contrib/ipfilter/netinet

[Cy Schubert]

Author: cy
Date: Sun Oct 18 03:09:03 2015
New Revision: 289480
URL: https://svnweb.freebsd.org/changeset/base/289480

Log:
  Really fix ipfilter bug 3600459.
  
  Obtained from:	ipfilter cvs repo r1.48.2.25, r1.72 and NetBSD repo r1.4
  MFC after:	3 days

Modified:
  head/sys/contrib/ipfilter/netinet/ip_state.c

Modified: head/sys/contrib/ipfilter/netinet/ip_state.c
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_state.c	Sun Oct 18 01:30:23 2015	(r289479)
+++ head/sys/contrib/ipfilter/netinet/ip_state.c	Sun Oct 18 03:09:03 2015	(r289480)
@@ -3650,7 +3650,6 @@ ipf_state_del(softc, is, why)
 	if (is->is_ref > 0) {
 		int refs;
 
-		is->is_ref--;
 		refs = is->is_ref;
 		MUTEX_EXIT(&is->is_lock);
 		if (!orphan)
@@ -3667,7 +3666,7 @@ ipf_state_del(softc, is, why)
 		}
 	}
 
-	is->is_ref = 0;
+	ASSERT(is->is_ref == 0);
 	MUTEX_EXIT(&is->is_lock);
 
 	if (is->is_tqehead[0] != NULL) {