lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETFILTER]: conntrack: fix refcount leak when finding expectation

Browse Source 
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>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yasuyuki Kozakai
2006-11-27 10:26:46 -08:00
committed by David S. Miller
parent c537b75a3b
commit 2e47c264a2
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/ipv4/netfilter/ip_conntrack_core.c
View File

@@ -225,11 +225,9 @@ __ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple)
struct ip_conntrack_expect *i; struct ip_conntrack_expect *i;
list_for_each_entry(i, &ip_conntrack_expect_list, list) { list_for_each_entry(i, &ip_conntrack_expect_list, list) {
if (ip_ct_tuple_mask_cmp(tuple, &i->tuple, &i->mask)) { if (ip_ct_tuple_mask_cmp(tuple, &i->tuple, &i->mask))
atomic_inc(&i->use);
return i; return i;
} }
}
return NULL; return NULL;
} }
@@ -241,6 +239,8 @@ ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple)
read_lock_bh(&ip_conntrack_lock); read_lock_bh(&ip_conntrack_lock);
i = __ip_conntrack_expect_find(tuple); i = __ip_conntrack_expect_find(tuple);
if (i)
atomic_inc(&i->use);
read_unlock_bh(&ip_conntrack_lock); read_unlock_bh(&ip_conntrack_lock);
return i; return i;

6
net/netfilter/nf_conntrack_core.c
View File

@@ -469,11 +469,9 @@ __nf_conntrack_expect_find(const struct nf_conntrack_tuple *tuple)
struct nf_conntrack_expect *i; struct nf_conntrack_expect *i;
list_for_each_entry(i, &nf_conntrack_expect_list, list) { list_for_each_entry(i, &nf_conntrack_expect_list, list) {
if (nf_ct_tuple_mask_cmp(tuple, &i->tuple, &i->mask)) { if (nf_ct_tuple_mask_cmp(tuple, &i->tuple, &i->mask))
atomic_inc(&i->use);
return i; return i;
} }
}
return NULL; return NULL;
} }
@@ -485,6 +483,8 @@ nf_conntrack_expect_find(const struct nf_conntrack_tuple *tuple)
read_lock_bh(&nf_conntrack_lock); read_lock_bh(&nf_conntrack_lock);
i = __nf_conntrack_expect_find(tuple); i = __nf_conntrack_expect_find(tuple);
if (i)
atomic_inc(&i->use);
read_unlock_bh(&nf_conntrack_lock); read_unlock_bh(&nf_conntrack_lock);
return i; return i;