Re: [PATCH 1/2]: conntrack: fix refcount leak when finding expectation

Re: [PATCH 1/2]: conntrack: fix refcount leak when finding expectation

[Patrick McHardy]

Yasuyuki KOZAKAI wrote:
> # Sorry, I forgot netfilter-devel, so resend.
> 
> All users of __{ip,nf}_conntrack_expect_find() don't expect that
> it increments the reference count of expectation.

Applied, thanks.

Re: [PATCH 1/2]: conntrack: fix refcount leak when findingexpectation

[Alan Ezust]

[-- Attachment #1: Type: text/plain, Size: 786 bytes --]

I noticed many messages indicating that things are being applied to conntrack 
and their related libs - but whenever I check my own checked out copy from 
svn (rev 6698), it does not show me anything new to update, and it appears as 
if nobody is committing to that particular part of the repo. Are you 
committing these changes to a branch other than trunk?



On Monday 27 November 2006 09:32, Patrick McHardy wrote:
> Yasuyuki KOZAKAI wrote:
> > # Sorry, I forgot netfilter-devel, so resend.
> >
> > All users of __{ip,nf}_conntrack_expect_find() don't expect that
> > it increments the reference count of expectation.
>
> Applied, thanks.

-- 
Alan Ezust            www.presinet.com
Presinet, inc         alan.ezust@presinet.com
           Victoria, BC, Canada

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH 1/2]: conntrack: fix refcount leak when findingexpectation

[Patrick McHardy]

Alan Ezust wrote:
> I noticed many messages indicating that things are being applied to conntrack 
> and their related libs - but whenever I check my own checked out copy from 
> svn (rev 6698), it does not show me anything new to update, and it appears as 
> if nobody is committing to that particular part of the repo. Are you 
> committing these changes to a branch other than trunk?

This patch was against the kernel not the libraries. The others you
mention probably as well.

[PATCH 1/2]: conntrack: fix refcount leak when finding expectation

[Yasuyuki KOZAKAI]

# Sorry, I forgot netfilter-devel, so resend.

All users of __{ip,nf}_conntrack_expect_find() don't expect that
it increments the reference count of expectation.

Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>

---
commit 139a3c05b435f47cfd26eba62c0e04b35bb5d9d3
tree 1aa652bd008fceeb66ea52d21c58deac031353f1
parent 1d301309e433ca67a74569a536078861a767c425
author Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Fri, 24 Nov 2006 07:09:46 +0900
committer Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Fri, 24 Nov 2006 07:09:46 +0900

 net/ipv4/netfilter/ip_conntrack_core.c |    6 +++---
 net/netfilter/nf_conntrack_core.c      |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c
index 143c466..8b848aa 100644
--- a/net/ipv4/netfilter/ip_conntrack_core.c
+++ b/net/ipv4/netfilter/ip_conntrack_core.c
@@ -225,10 +225,8 @@ __ip_conntrack_expect_find(const struct
 	struct ip_conntrack_expect *i;
 	
 	list_for_each_entry(i, &ip_conntrack_expect_list, list) {
-		if (ip_ct_tuple_mask_cmp(tuple, &i->tuple, &i->mask)) {
-			atomic_inc(&i->use);
+		if (ip_ct_tuple_mask_cmp(tuple, &i->tuple, &i->mask))
 			return i;
-		}
 	}
 	return NULL;
 }
@@ -241,6 +239,8 @@ ip_conntrack_expect_find(const struct ip
 	
 	read_lock_bh(&ip_conntrack_lock);
 	i = __ip_conntrack_expect_find(tuple);
+	if (i)
+		atomic_inc(&i->use);
 	read_unlock_bh(&ip_conntrack_lock);
 
 	return i;
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 0f58307..de0567b 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -469,10 +469,8 @@ __nf_conntrack_expect_find(const struct
 	struct nf_conntrack_expect *i;
 	
 	list_for_each_entry(i, &nf_conntrack_expect_list, list) {
-		if (nf_ct_tuple_mask_cmp(tuple, &i->tuple, &i->mask)) {
-			atomic_inc(&i->use);
+		if (nf_ct_tuple_mask_cmp(tuple, &i->tuple, &i->mask))
 			return i;
-		}
 	}
 	return NULL;
 }
@@ -485,6 +483,8 @@ nf_conntrack_expect_find(const struct nf
 	
 	read_lock_bh(&nf_conntrack_lock);
 	i = __nf_conntrack_expect_find(tuple);
+	if (i)
+		atomic_inc(&i->use);
 	read_unlock_bh(&nf_conntrack_lock);
 
 	return i;