Skip to contentSkip to conversation

netfilter: nf_tables: release objects on netns destruction

PATCH Superseded Pablo Neira Ayuso 2 participants 3 messages Dec 9, 2015 – Dec 13, 2015

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

PATCH v2 1/1 netfilter: nf_tables: release objects on netns destruction

We have to release the existing objects on netns removal otherwise we leak them. Chains are unregistered in first place to make sure no packets are walking on our rules and sets anymore.

---
v2: Unregister chains in first place to make sure no packets are walking
over rules and sets anymore.

 net/netfilter/nf_tables_api.c | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +42 -1
index f1002dc..d6c3366 100644
@@ -4578,7 +4578,7 @@ int nft_data_dump(struct sk_buff *skb, int attr, const struct nft_data *data,
 }
 EXPORT_SYMBOL_GPL(nft_data_dump);
 
-static int nf_tables_init_net(struct net *net)
+static int __net_init nf_tables_init_net(struct net *net)
 {
 	INIT_LIST_HEAD(&net->nft.af_info);
 	INIT_LIST_HEAD(&net->nft.commit_list);
@@ -4586,8 +4586,49 @@ static int nf_tables_init_net(struct net *net)
 	return 0;
 }
 
+static void __net_exit nf_tables_exit_net(struct net *net)
+{
+	struct nft_table *table, *nt;
+	struct nft_chain *chain, *nc;
+	struct nft_rule *rule, *nr;
+	struct nft_set *set, *ns;
+	struct nft_af_info *afi;
+	struct nft_ctx ctx;
+
+	nfnl_lock(NFNL_SUBSYS_NFTABLES);
+	list_for_each_entry(afi, &net->nft.af_info, list) {
+		ctx.afi = afi;
+		list_for_each_entry_safe(table, nt, &afi->tables, list) {
+			list_for_each_entry(chain, &table->chains, list)
+				nf_tables_unregister_hooks(table, chain,
+							   afi->nops);
+			/* No packets are walking on these chains anymore. */
+			ctx.table = table;
+			list_for_each_entry(chain, &table->chains, list) {
+				ctx.chain = chain;
+				list_for_each_entry_safe(rule, nr, &chain->rules, list) {
+					list_del(&rule->list);
+					nf_tables_rule_destroy(&ctx, rule);
+				}
+			}
+			list_for_each_entry_safe(set, ns, &table->sets, list) {
+				list_del(&set->list);
+				nft_set_destroy(set);
+			}
+			list_for_each_entry_safe(chain, nc, &table->chains, list) {
+				list_del(&chain->list);
+				nf_tables_chain_destroy(chain);
+			}
+			list_del(&table->list);
+			nf_tables_table_destroy(&ctx);
+		}
+	}
+	nfnl_unlock(NFNL_SUBSYS_NFTABLES);
+}
+
 static struct pernet_operations nf_tables_net_ops = {
 	.init	= nf_tables_init_net,
+	.exit	= nf_tables_exit_net,
 };
 
 static int __init nf_tables_module_init(void)
Signature · 1 line
2.1.4
Tested-by on v2 1/1
#1 lore raw
Quoted 4 lines · Pablo Neira Ayuso

We have to release the existing objects on netns removal otherwise we leak them. Chains are unregistered in first place to make sure no packets are walking on our rules and sets anymore.

Quoted 9 lines

---
v2: Unregister chains in first place to make sure no packets are walking
over rules and sets anymore.

 net/netfilter/nf_tables_api.c | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

I've run a kernel with this patch, did some tests regarding netns and nftables, and found no problems so far :-)

Signature · 5 lines
Arturo Borrero González
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
author maintainer
#2 lore raw
In reply to Pablo Neira Ayuso
Quoted 3 lines · Pablo Neira Ayuso

We have to release the existing objects on netns removal otherwise we leak them. Chains are unregistered in first place to make sure no packets are walking on our rules and sets anymore.

I have detected a problem in this patch.

The netns_exit path from every family is removing the afinfo object before this iteration here, so this is not working in case family netns exit callbacks are called before the ones from the core.

I'm going to toss it, will send a new version.