[PATCH 1/2] nf_conntrack: remove nf_conntrack stat proc file when cleaning up

[KOVACS Krisztian <hidden@balabit.hu>]

[-- Attachment #1: Type: text/plain, Size: 184 bytes --]


  Hi,

  nf_conntrack does not properly remove /proc/net/stat/nf_conntrack when 
cleaning up. The attached patch seems to solve (at least in nfsim).

-- 
 Regards,
  Krisztian Kovacs

[-- Attachment #2: 02-nf_conntrack-remove_stat_proc_file.patch --]
[-- Type: text/x-diff, Size: 1131 bytes --]

[NETFILTER] Remove nf_conntrack stat proc file when cleaning up

Fix nf_conntrack statistics proc file removal. Looks like the old bug
was forward-ported from ip_conntrack. :-]

Signed-off-by: KOVACS Krisztian <hidden@balabit.hu>

---
commit d9c38734c90540ea7c8fb5eb11ff77c05d6dbb40
tree 17fd2f4b3de0ef4b9dc52dc8cbe35924c7482f25
parent a3d662dd415a847d60097d17d6f634429b886b8f
author KOVACS Krisztian <hidden@balabit.hu> Fri, 04 Nov 2005 11:35:48 +0100
committer KOVACS Krisztian <hidden@balabit.hu> Fri, 04 Nov 2005 11:35:48 +0100

 net/netfilter/nf_conntrack_standalone.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index d2ea098..3dd65fe 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -694,7 +694,7 @@ static int init_or_cleanup(int init)
  cleanup_proc_stat:
 #endif
 #ifdef CONFIG_PROC_FS
-	proc_net_remove("nf_conntrack_stat");
+	remove_proc_entry("nf_conntrack", proc_net_stat);
  cleanup_proc_exp:
 	proc_net_remove("nf_conntrack_expect");
  cleanup_proc: