Skip to contentSkip to conversation

netfilter: Fix proc removal in ip_conntrack_standalone

PATCH New Rusty Russell 1 participant 1 message Dec 31, 2004

Subsystems (2)
Networking netfilter
lore
Share & tools
lore

Rusty Russell

author
#0 lore raw

PATCH 3/8 netfilter: Fix proc removal in ip_conntrack_standalone

Name: Fix proc removal in ip_conntrack_standalone
Status: Tested under nfsim

Signed-off-by Rusty Russell <[email protected]>

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.

net/ipv4/netfilter/ip_conntrack_standalone.c +2 -2
Index: linux-2.6.10-bk1-Netfilter/net/ipv4/netfilter/ip_conntrack_standalone.c
===================================================================
@@ -820,8 +820,8 @@
 	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");
Signature · 1 line
A bad analogy is like a leaky screwdriver -- Richard Braakman