diff options
| author | Patrick McHardy <kaber@trash.net> | 2003-07-25 01:20:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-07-25 01:20:44 -0700 |
| commit | c828efd50934852b6c75a3713101b0207f7f7ef4 (patch) | |
| tree | 28d5e41fa5dff1051a72e2b8be873ed3be11a67c /net | |
| parent | f2c06f0484a15d0779ab998953e8e2cc82e976c9 (diff) | |
[NETFILTER]: Drop reference to conntrack after removing confirmed expectation.
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_core.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c index 0c19a8881a94..b0f1db9c9357 100644 --- a/net/ipv4/netfilter/ip_conntrack_core.c +++ b/net/ipv4/netfilter/ip_conntrack_core.c @@ -251,7 +251,7 @@ static void unexpect_related(struct ip_conntrack_expect *expect) } /* delete all unconfirmed expectations for this conntrack */ -static void remove_expectations(struct ip_conntrack *ct) +static void remove_expectations(struct ip_conntrack *ct, int drop_refcount) { struct list_head *exp_entry, *next; struct ip_conntrack_expect *exp; @@ -266,8 +266,11 @@ static void remove_expectations(struct ip_conntrack *ct) * the un-established ones only */ if (exp->sibling) { DEBUGP("remove_expectations: skipping established %p of %p\n", exp->sibling, ct); - /* Indicate that this expectations parent is dead */ - exp->expectant = NULL; + if (drop_refcount) { + /* Indicate that this expectations parent is dead */ + ip_conntrack_put(exp->expectant); + exp->expectant = NULL; + } continue; } @@ -292,7 +295,7 @@ clean_from_lists(struct ip_conntrack *ct) &ct->tuplehash[IP_CT_DIR_REPLY]); /* Destroy all un-established, pending expectations */ - remove_expectations(ct); + remove_expectations(ct, 1); } static void @@ -1117,7 +1120,7 @@ static inline int unhelp(struct ip_conntrack_tuple_hash *i, { if (i->ctrack->helper == me) { /* Get rid of any expected. */ - remove_expectations(i->ctrack); + remove_expectations(i->ctrack, 0); /* And *then* set helper to NULL */ i->ctrack->helper = NULL; } |