From: Patrick McHardy <kaber@trash.net>
To: Harald Welte <laforge@netfilter.org>
Cc: Netfilter Development Mailinglist
<netfilter-devel@lists.netfilter.org>,
"David S. Miller" <davem@davemloft.net>
Subject: [NETFILTER 2/8]: pptp helper: fix expectation leaks
Date: Fri, 16 Sep 2005 00:44:41 +0200 [thread overview]
Message-ID: <4329F959.906@trash.net> (raw)
[-- Attachment #1: 02.diff --]
[-- Type: text/x-patch, Size: 1704 bytes --]
[NETFILTER]: pptp helper: fix expectation leaks
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
commit 66479fa28dab1e923dd946ae1eafe7cbf89fa9a1
tree 846f0596cdeea1e41696258b182fe86f6730ae03
parent b806b1f4d971bfb3bd348a7d8d9029b6b5c9c23b
author Patrick McHardy <kaber@trash.net> Thu, 15 Sep 2005 22:32:57 +0200
committer Patrick McHardy <kaber@trash.net> Thu, 15 Sep 2005 22:32:57 +0200
net/ipv4/netfilter/ip_conntrack_helper_pptp.c | 2 ++
net/ipv4/netfilter/ip_nat_helper_pptp.c | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/net/ipv4/netfilter/ip_conntrack_helper_pptp.c b/net/ipv4/netfilter/ip_conntrack_helper_pptp.c
--- a/net/ipv4/netfilter/ip_conntrack_helper_pptp.c
+++ b/net/ipv4/netfilter/ip_conntrack_helper_pptp.c
@@ -129,6 +129,7 @@ static void pptp_expectfn(struct ip_conn
/* delete other expectation. */
DEBUGP("found\n");
ip_conntrack_unexpect_related(exp_other);
+ ip_conntrack_expect_put(exp_other);
} else {
DEBUGP("not found\n");
}
@@ -160,6 +161,7 @@ static int timeout_ct_or_exp(const struc
if (exp) {
DEBUGP("unexpect_related of expect %p\n", exp);
ip_conntrack_unexpect_related(exp);
+ ip_conntrack_expect_put(exp);
return 1;
}
}
diff --git a/net/ipv4/netfilter/ip_nat_helper_pptp.c b/net/ipv4/netfilter/ip_nat_helper_pptp.c
--- a/net/ipv4/netfilter/ip_nat_helper_pptp.c
+++ b/net/ipv4/netfilter/ip_nat_helper_pptp.c
@@ -104,6 +104,7 @@ static void pptp_nat_expected(struct ip_
other_exp = __ip_conntrack_expect_find(&t);
if (other_exp) {
ip_conntrack_unexpect_related(other_exp);
+ ip_conntrack_expect_put(other_exp);
DEBUGP("success\n");
} else {
DEBUGP("not found!\n");
reply other threads:[~2005-09-15 22:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4329F959.906@trash.net \
--to=kaber@trash.net \
--cc=davem@davemloft.net \
--cc=laforge@netfilter.org \
--cc=netfilter-devel@lists.netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.