Patchwork [2/2] netfilter: nf_tables: do not allow deletion/replacement of stale rules

login
register
mail settings
Submitter Pablo Neira
Date Sept. 17, 2013, 10:14 p.m.
Message ID <1379456095-4070-2-git-send-email-pablo@netfilter.org>
Download mbox | patch
Permalink /patch/275562/
State Accepted
Headers show

Comments

Pablo Neira - Sept. 17, 2013, 10:14 p.m.
Stale rules are those that will be purge out in the commit step.
Do not allow to delete/replace a rule that is stale.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 net/netfilter/nf_tables_api.c |   27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

Patch

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 0e55e1b..0627023 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -1655,12 +1655,17 @@  static int nf_tables_newrule(struct sock *nlsk, struct sk_buff *skb,
 	}
 
 	if (nlh->nlmsg_flags & NLM_F_REPLACE) {
-		nft_rule_disactivate_next(net, old_rule);
-		rupd = nf_tables_trans_add(old_rule, &ctx);
-		if (rupd == NULL)
-			goto err2;
+		if (nft_rule_is_active_next(net, old_rule)) {
+			nft_rule_disactivate_next(net, old_rule);
+			rupd = nf_tables_trans_add(old_rule, &ctx);
+			if (rupd == NULL)
+				goto err2;
 
-		list_add_tail(&rule->list, &old_rule->list);
+			list_add_tail(&rule->list, &old_rule->list);
+		} else {
+			nf_tables_rule_destroy(rule);
+			return -ENOENT;
+		}
 	} else if (nlh->nlmsg_flags & NLM_F_APPEND)
 		if (old_rule)
 			list_add_rcu(&rule->list, &old_rule->list);
@@ -1698,11 +1703,15 @@  err1:
 static int
 nf_tables_delrule_one(struct nft_ctx *ctx, struct nft_rule *rule)
 {
-	nft_rule_disactivate_next(ctx->net, rule);
-	if (nf_tables_trans_add(rule, ctx) == NULL)
-		return -ENOMEM;
+	/* You cannot delete the same rule twice */
+	if (nft_rule_is_active_next(ctx->net, rule)) {
+		nft_rule_disactivate_next(ctx->net, rule);
+		if (nf_tables_trans_add(rule, ctx) == NULL)
+			return -ENOMEM;
 
-	return 0;
+		return 0;
+	}
+	return -ENOENT;
 }
 
 static int nf_tables_delrule(struct sock *nlsk, struct sk_buff *skb,