summaryrefslogtreecommitdiffstats
path: root/sys/contrib
diff options
context:
space:
mode:
authorcy <cy@FreeBSD.org>2015-10-20 13:20:29 +0000
committercy <cy@FreeBSD.org>2015-10-20 13:20:29 +0000
commit153d364641ca8ca49a3dd01007bb5caaa992194a (patch)
tree4d406712579b758d5f3d51b0f1d36c70a89e5d08 /sys/contrib
parent1933ba006a7d961ec6682d79a5f2e3b4eddfac23 (diff)
downloadFreeBSD-src-153d364641ca8ca49a3dd01007bb5caaa992194a.zip
FreeBSD-src-153d364641ca8ca49a3dd01007bb5caaa992194a.tar.gz
MFC r289480. Really fix ipfilter bug 3600459.
Obtained from: ipfilter cvs repo r1.48.2.25, r1.72 and NetBSD repo r1.4
Diffstat (limited to 'sys/contrib')
-rw-r--r--sys/contrib/ipfilter/netinet/ip_state.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_state.c b/sys/contrib/ipfilter/netinet/ip_state.c
index a3930ea..2ceec32 100644
--- a/sys/contrib/ipfilter/netinet/ip_state.c
+++ b/sys/contrib/ipfilter/netinet/ip_state.c
@@ -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) {
OpenPOWER on IntegriCloud