diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2005-01-01 18:46:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-01-01 18:46:04 -0800 |
| commit | 7e00d78dccb4f8fab0ec39060655a4904c0ce0a3 (patch) | |
| tree | fc6cfeea885e5fe67a76d5a9608b11239e1ff23a /net | |
| parent | 0bd3c5023ee0ccbf3e7ac2810e1e7c46c58e4465 (diff) | |
| download | history-7e00d78dccb4f8fab0ec39060655a4904c0ce0a3.tar.gz | |
[PATCH] Fix proc removal in ip_conntrack_standalone
Someone thought it would be clever if proc code ignores removal of
non-existent entries. Hence, we missed that /proc/net/stat/ip_conntrack
is never removed on module removal or init failure.
Found by nfsim.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_standalone.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c index cc709c436bc941..9c01c09721b390 100644 --- a/net/ipv4/netfilter/ip_conntrack_standalone.c +++ b/net/ipv4/netfilter/ip_conntrack_standalone.c @@ -820,8 +820,8 @@ static int init_or_cleanup(int init) nf_unregister_hook(&ip_conntrack_defrag_ops); cleanup_proc_stat: #ifdef CONFIG_PROC_FS - proc_net_remove("ip_conntrack_stat"); -cleanup_proc_exp: + remove_proc_entry("ip_conntrack", proc_net_stat); + cleanup_proc_exp: proc_net_remove("ip_conntrack_expect"); cleanup_proc: proc_net_remove("ip_conntrack"); |