OSDN Git Service

[NETFILTER]: nf_conntrack: Fix module refcount dropping too far
authorYasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Tue, 25 Apr 2006 00:15:17 +0000 (17:15 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Tue, 25 Apr 2006 00:27:28 +0000 (17:27 -0700)
commite1bbdebdba615ddd957de81103aa2f7fa0581952
tree58db2991440cfeca18678bdeed5dd45d38b186bb
parentd8fe3f19203b1f5070358aaa292d33295258b448
[NETFILTER]: nf_conntrack: Fix module refcount dropping too far

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>
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_l3proto_generic.c