leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[NETFILTER]: nf_conntrack: Fix module refcount dropping too far

Browse Source 
If nf_ct_l3proto_find_get() fails to get the refcount of
nf_ct_l3proto_generic, nf_ct_l3proto_put() will drop the refcount
too far.

This gets rid of '.me = THIS_MODULE' of nf_ct_l3proto_generic so that
nf_ct_l3proto_find_get() doesn't try to get refcount of it.
It's OK because its symbol is usable until nf_conntrack.ko is unloaded.

This also kills unnecessary NULL pointer check as well.
__nf_ct_proto_find() allways returns non-NULL pointer.

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-04-24 17:15:17 -07:00 committed by David S. Miller
parent d8fe3f1920
commit e1bbdebdba
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/netfilter/nf_conntrack_core.c
View File

@ -208,10 +208,8 @@ nf_ct_proto_find_get(u_int16_t l3proto, u_int8_t protocol)
preempt_disable(); preempt_disable();
p = __nf_ct_proto_find(l3proto, protocol); p = __nf_ct_proto_find(l3proto, protocol);
if (p) { if (!try_module_get(p->me))
if (!try_module_get(p->me)) p = &nf_conntrack_generic_protocol;
p = &nf_conntrack_generic_protocol;
}
preempt_enable(); preempt_enable();
return p; return p;
@ -229,10 +227,8 @@ nf_ct_l3proto_find_get(u_int16_t l3proto)
preempt_disable(); preempt_disable();
p = __nf_ct_l3proto_find(l3proto); p = __nf_ct_l3proto_find(l3proto);
if (p) { if (!try_module_get(p->me))
if (!try_module_get(p->me)) p = &nf_conntrack_generic_l3proto;
p = &nf_conntrack_generic_l3proto;
}
preempt_enable(); preempt_enable();
return p; return p;

1
net/netfilter/nf_conntrack_l3proto_generic.c
View File

@ -94,5 +94,4 @@ struct nf_conntrack_l3proto nf_conntrack_generic_l3proto = {
.print_conntrack = generic_print_conntrack, .print_conntrack = generic_print_conntrack,
.prepare = generic_prepare, .prepare = generic_prepare,
.get_features = generic_get_features, .get_features = generic_get_features,
.me = THIS_MODULE,
}; };