Author: cy
Date: Tue Oct 20 13:20:29 2015
New Revision: 289628
URL: https://svnweb.freebsd.org/changeset/base/289628

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

Modified:
  stable/10/sys/contrib/ipfilter/netinet/ip_state.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/contrib/ipfilter/netinet/ip_state.c
==============================================================================
--- stable/10/sys/contrib/ipfilter/netinet/ip_state.c   Tue Oct 20 12:49:38 
2015        (r289627)
+++ stable/10/sys/contrib/ipfilter/netinet/ip_state.c   Tue Oct 20 13:20:29 
2015        (r289628)
@@ -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) {
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to