Patchwork xt_recent fix BUG()

login
register
mail settings
Submitter Vitaly E. Lavrov
Date Dec. 11, 2012, 7:06 p.m.
Message ID <50C78438.4040102@guap.ru>
Download mbox | patch
Permalink /patch/205294/
State Accepted
Headers show

Comments

Vitaly E. Lavrov - Dec. 11, 2012, 7:06 p.m.
The following patch fixes a bug in xt_recent.
Bug appears at the end of work the networks namespace, provided that the 
tables (filter/mangle/raw) have rule  with xt_recent.
The error occurs because the __net_exit recent_net_exit() is executed 
before the tables are cleared.
Change this order of calls is impossible, since tables must be 
registered earlier than extensions.
Bug exists in all versions of the kernel since 2.6.35

Cleaning tables before completing the network namespace can be used as a 
workaround.

Idea of the patch that if the files are deleted from the directory 
/proc/net/xt_recent" procedure XXXXX, then a flag is set "clean".
If cleaning the tables occurs later and the flag "clean" is set, then 
the delete files is skipped.

Patch for kernel 3.4.22

Signed-off-by: Vitaly Lavrov lve@guap.ru

--
                 kfree(t);
@@ -599,15 +601,26 @@ static int __net_init recent_net_init(struct net *net)
  {
         struct recent_net *recent_net = recent_pernet(net);

+#ifdef CONFIG_PROC_FS
+       recent_net->clean = 0;
+#endif
         INIT_LIST_HEAD(&recent_net->tables);
         return recent_proc_net_init(net);
  }

  static void __net_exit recent_net_exit(struct net *net)
  {
+#ifdef CONFIG_PROC_FS
         struct recent_net *recent_net = recent_pernet(net);
+       struct recent_table *t;

-       BUG_ON(!list_empty(&recent_net->tables));
+       spin_lock_bh(&recent_lock);
+       recent_net->clean = 1;
+       list_for_each_entry(t, &recent_net->tables, list) {
+               remove_proc_entry(t->name, recent_net->xt_recent);
+       }
+       }
+       spin_unlock_bh(&recent_lock);
+#endif
         recent_proc_net_exit(net);
  }
diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
index d2ff15a..747d52d 100644
--- a/net/netfilter/xt_recent.c
+++ b/net/netfilter/xt_recent.c
@@ -85,6 +85,7 @@ struct recent_net {
 	struct list_head	tables;
 #ifdef CONFIG_PROC_FS
 	struct proc_dir_entry	*xt_recent;
+	int			clean;
 #endif
 };
 
@@ -398,7 +399,8 @@ static void recent_mt_destroy(const struct xt_mtdtor_param *par)
 		list_del(&t->list);
 		spin_unlock_bh(&recent_lock);
 #ifdef CONFIG_PROC_FS
-		remove_proc_entry(t->name, recent_net->xt_recent);
+		if(!recent_net->clean)
+			remove_proc_entry(t->name, recent_net->xt_recent);
 #endif
 		recent_table_flush(t);
 		kfree(t);
@@ -599,15 +601,26 @@ static int __net_init recent_net_init(struct net *net)
 {
 	struct recent_net *recent_net = recent_pernet(net);
 
+#ifdef CONFIG_PROC_FS
+	recent_net->clean = 0;
+#endif
 	INIT_LIST_HEAD(&recent_net->tables);
 	return recent_proc_net_init(net);
 }
 
 static void __net_exit recent_net_exit(struct net *net)
 {
+#ifdef CONFIG_PROC_FS
 	struct recent_net *recent_net = recent_pernet(net);
+	struct recent_table *t;
 
-	BUG_ON(!list_empty(&recent_net->tables));
+	spin_lock_bh(&recent_lock);
+	recent_net->clean = 1;
+	list_for_each_entry(t, &recent_net->tables, list) {
+		remove_proc_entry(t->name, recent_net->xt_recent);
+	}
+	spin_unlock_bh(&recent_lock);
+#endif
 	recent_proc_net_exit(net);
 }
Pablo Neira - Dec. 16, 2012, 10:50 p.m.
Hi Vitaly,

On Tue, Dec 11, 2012 at 11:06:32PM +0400, Vitaly E. Lavrov wrote:
> The following patch fixes a bug in xt_recent.
> Bug appears at the end of work the networks namespace, provided that
> the tables (filter/mangle/raw) have rule  with xt_recent.
> The error occurs because the __net_exit recent_net_exit() is
> executed before the tables are cleared.
> Change this order of calls is impossible, since tables must be
> registered earlier than extensions.
> Bug exists in all versions of the kernel since 2.6.35
> 
> Cleaning tables before completing the network namespace can be used
> as a workaround.
> 
> Idea of the patch that if the files are deleted from the directory
> /proc/net/xt_recent" procedure XXXXX, then a flag is set "clean".
> If cleaning the tables occurs later and the flag "clean" is set,
> then the delete files is skipped.
> 
> Patch for kernel 3.4.22

I need that the patch applies to some more recent kernel tree.

Same comment for the hashlimit fix.

Could you send me a new round rebased upon it, please? Thanks.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
index d2ff15a..747d52d 100644
--- a/net/netfilter/xt_recent.c
+++ b/net/netfilter/xt_recent.c
@@ -85,6 +85,7 @@  struct recent_net {
         struct list_head        tables;
  #ifdef CONFIG_PROC_FS
         struct proc_dir_entry   *xt_recent;
+       int                     clean;
  #endif
  };

@@ -398,7 +399,8 @@  static void recent_mt_destroy(const struct 
xt_mtdtor_param *par)
                 list_del(&t->list);
                 spin_unlock_bh(&recent_lock);
  #ifdef CONFIG_PROC_FS
-               remove_proc_entry(t->name, recent_net->xt_recent);
+               if(!recent_net->clean)
+                       remove_proc_entry(t->name, recent_net->xt_recent);
  #endif
                 recent_table_flush(t);