Skip to contentSkip to conversation

netfilter: nf_tables: fix memory leak during stateful obj update

PATCH Superseded Florian Westphal 2 participants 5 messages Feb 20, 2022 – Feb 21, 2022

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Florian Westphal

author maintainer
#0 lore raw

PATCH v2 1/1 netfilter: nf_tables: fix memory leak during stateful obj update

stateful objects can be updated from the control plane. The transaction logic allocates a temporary object for this purpose.

This object has to be released via nft_obj_destroy, not kfree, since the ->init function was called and it can have side effects beyond memory allocation.

Unlike normal NEWOBJ path, the objects module refcount isn't incremented, so add nft_newobj_destroy and use that.

Fixes d62d0ba97b58 ("netfilter: nf_tables: Introduce stateful object update operation")
Cc Fernando Fernandez Mancera <[email protected]>

---
v2: can't use nft_obj_destroy, module refcount is not incremented.

 net/netfilter/nf_tables_api.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
net/netfilter/nf_tables_api.c +11 -2
index 5fa16990da95..56208e778982 100644
@@ -6909,6 +6909,15 @@ static int nf_tables_getobj(struct sk_buff *skb, const struct nfnl_info *info,
 	return err;
 }
 
+/* nf_tables_updobj does not increment module refcount */
+static void nft_newobj_destroy(const struct nft_ctx *ctx, struct nft_object *obj)
+{
+	if (obj->ops->destroy)
+		obj->ops->destroy(ctx, obj);
+
+	kfree(obj);
+}
+
 static void nft_obj_destroy(const struct nft_ctx *ctx, struct nft_object *obj)
 {
 	if (obj->ops->destroy)
@@ -8185,7 +8194,7 @@ static void nft_obj_commit_update(struct nft_trans *trans)
 	if (obj->ops->update)
 		obj->ops->update(obj, newobj);
 
-	kfree(newobj);
+	nft_newobj_destroy(&trans->ctx, newobj);
 }
 
 static void nft_commit_release(struct nft_trans *trans)
@@ -8976,7 +8985,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)
 			break;
 		case NFT_MSG_NEWOBJ:
 			if (nft_trans_obj_update(trans)) {
-				kfree(nft_trans_obj_newobj(trans));
+				nft_newobj_destroy(&trans->ctx, nft_trans_obj_newobj(trans));
 				nft_trans_destroy(trans);
 			} else {
 				trans->ctx.table->use--;
Signature · 1 line
2.35.1
#1 lore raw

Hi Florian,

Quoted 9 lines · Florian Westphal

stateful objects can be updated from the control plane. The transaction logic allocates a temporary object for this purpose.

This object has to be released via nft_obj_destroy, not kfree, since the ->init function was called and it can have side effects beyond memory allocation.

Unlike normal NEWOBJ path, the objects module refcount isn't incremented, so add nft_newobj_destroy and use that.

Probably this? .udata and .key is NULL for the update path so kfree should be fine.

From 909c4c67deadbc674fcadd081c32c0781eb8e26f Mon Sep 17 00:00:00 2001
From: Florian Westphal <[email protected]>
Date: Sun, 20 Feb 2022 12:18:50 +0100
Subject: [PATCH] netfilter: nf_tables: fix memory leak during stateful obj
update

stateful objects can be updated from the control plane. The transaction logic allocates a temporary object for this purpose.

This object has to be released via nft_obj_destroy, not kfree, since the ->init function was called and it can have side effects beyond memory allocation.

Unlike normal NEWOBJ path, the objects module refcount isn't incremented, so extend nft_obj_destroy to specify if this is an update.

Fixes d62d0ba97b58 ("netfilter: nf_tables: Introduce stateful object update operation")
Cc Fernando Fernandez Mancera <[email protected]>
---
 net/netfilter/nf_tables_api.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
net/netfilter/nf_tables_api.c +11 -7
index 3081c4399f10..7982268d0001 100644
@@ -6909,12 +6909,16 @@ static int nf_tables_getobj(struct sk_buff *skb, const struct nfnl_info *info,
 	return err;
 }
 
-static void nft_obj_destroy(const struct nft_ctx *ctx, struct nft_object *obj)
+static void nft_obj_destroy(const struct nft_ctx *ctx, struct nft_object *obj,
+			    bool update)
 {
 	if (obj->ops->destroy)
 		obj->ops->destroy(ctx, obj);
 
-	module_put(obj->ops->type->owner);
+	/* nf_tables_updobj does not increment module refcount */
+	if (!update)
+		module_put(obj->ops->type->owner);
+
 	kfree(obj->key.name);
 	kfree(obj->udata);
 	kfree(obj);
@@ -8185,7 +8189,7 @@ static void nft_obj_commit_update(struct nft_trans *trans)
 	if (obj->ops->update)
 		obj->ops->update(obj, newobj);
 
-	kfree(newobj);
+	nft_obj_destroy(&trans->ctx, newobj, true);
 }
 
 static void nft_commit_release(struct nft_trans *trans)
@@ -8213,7 +8217,7 @@ static void nft_commit_release(struct nft_trans *trans)
 					   nft_trans_elem(trans).priv);
 		break;
 	case NFT_MSG_DELOBJ:
-		nft_obj_destroy(&trans->ctx, nft_trans_obj(trans));
+		nft_obj_destroy(&trans->ctx, nft_trans_obj(trans), false);
 		break;
 	case NFT_MSG_DELFLOWTABLE:
 		if (nft_trans_flowtable_update(trans))
@@ -8853,7 +8857,7 @@ static void nf_tables_abort_release(struct nft_trans *trans)
 				     nft_trans_elem(trans).priv, true);
 		break;
 	case NFT_MSG_NEWOBJ:
-		nft_obj_destroy(&trans->ctx, nft_trans_obj(trans));
+		nft_obj_destroy(&trans->ctx, nft_trans_obj(trans), false);
 		break;
 	case NFT_MSG_NEWFLOWTABLE:
 		if (nft_trans_flowtable_update(trans))
@@ -8976,7 +8980,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)
 			break;
 		case NFT_MSG_NEWOBJ:
 			if (nft_trans_obj_update(trans)) {
-				kfree(nft_trans_obj_newobj(trans));
+				nft_obj_destroy(&trans->ctx, nft_trans_obj_newobj(trans), true);
 				nft_trans_destroy(trans);
 			} else {
 				trans->ctx.table->use--;
@@ -9693,7 +9697,7 @@ static void __nft_release_table(struct net *net, struct nft_table *table)
 	list_for_each_entry_safe(obj, ne, &table->objects, list) {
 		nft_obj_del(obj);
 		table->use--;
-		nft_obj_destroy(&ctx, obj);
+		nft_obj_destroy(&ctx, obj, false);
 	}
 	list_for_each_entry_safe(chain, nc, &table->chains, list) {
 		ctx.chain = chain;
Signature · 1 line
2.30.2
author maintainer
#2 lore raw
Quoted 8 lines · Pablo Neira Ayuso
Quoted 7 lines · Florian Westphal

stateful objects can be updated from the control plane. The transaction logic allocates a temporary object for this purpose.

This object has to be released via nft_obj_destroy, not kfree, since the ->init function was called and it can have side effects beyond memory allocation.

Quoted 5 lines
Quoted 2 lines

Unlike normal NEWOBJ path, the objects module refcount isn't incremented, so add nft_newobj_destroy and use that.

Probably this? .udata and .key is NULL for the update path so kfree should be fine.

Yes, that works too.

We could also ...

net/netfilter/nf_tables_api.c static int nf_tables_getobj(struct sk_buff *skb, const struct nfnl_info *info, · line 6921

Quoted 5 lines
net/netfilter/nf_tables_api.c +4 -1
-	module_put(obj->ops->type->owner);
+	/* nf_tables_updobj does not increment module refcount */
+	if (!update)
+		module_put(obj->ops->type->owner);
+

Increment the refcount for update case as well to avoid the special case?

author maintainer
#3 lore raw
Quoted 19 lines · Florian Westphal
Quoted 8 lines · Pablo Neira Ayuso
Quoted 7 lines · Florian Westphal

stateful objects can be updated from the control plane. The transaction logic allocates a temporary object for this purpose.

This object has to be released via nft_obj_destroy, not kfree, since the ->init function was called and it can have side effects beyond memory allocation.

Quoted 5 lines
Quoted 2 lines

Unlike normal NEWOBJ path, the objects module refcount isn't incremented, so add nft_newobj_destroy and use that.

Probably this? .udata and .key is NULL for the update path so kfree should be fine.

Yes, that works too.

We could also ...

Quoted 8 lines

Review

Quoted 5 lines
(quoted diff) +4 -1
-	module_put(obj->ops->type->owner);
+	/* nf_tables_updobj does not increment module refcount */
+	if (!update)
+		module_put(obj->ops->type->owner);
+

Increment the refcount for update case as well to avoid the special case?

Untested:

net/netfilter/nf_tables_api.c +8 -3
index 3081c4399f10..49060f281342 100644
@@ -6553,10 +6553,13 @@ static int nf_tables_updobj(const struct nft_ctx *ctx,
 	struct nft_trans *trans;
 	int err;
 
+	if (!try_module_get(type->owner))
+		return -ENOENT;
+
 	trans = nft_trans_alloc(ctx, NFT_MSG_NEWOBJ,
 				sizeof(struct nft_trans_obj));
 	if (!trans)
-		return -ENOMEM;
+		goto err_trans;
 
 	newobj = nft_obj_init(ctx, type, attr);
 	if (IS_ERR(newobj)) {
@@ -6573,6 +6576,8 @@ static int nf_tables_updobj(const struct nft_ctx *ctx,
 
 err_free_trans:
 	kfree(trans);
+err_trans:
+	module_put(type->owner);
 	return err;
 }
 
@@ -8185,7 +8190,7 @@ static void nft_obj_commit_update(struct nft_trans *trans)
 	if (obj->ops->update)
 		obj->ops->update(obj, newobj);
 
-	kfree(newobj);
+	nft_obj_destroy(&trans->ctx, newobj);
 }
 
 static void nft_commit_release(struct nft_trans *trans)
@@ -8976,7 +8981,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)
 			break;
 		case NFT_MSG_NEWOBJ:
 			if (nft_trans_obj_update(trans)) {
-				kfree(nft_trans_obj_newobj(trans));
+				nft_obj_destroy(&trans->ctx, nft_trans_obj_newobj(trans));
 				nft_trans_destroy(trans);
 			} else {
 				trans->ctx.table->use--;
#4 lore raw
Quoted 20 lines · Florian Westphal
Quoted 19 lines · Florian Westphal
Quoted 8 lines · Pablo Neira Ayuso
Quoted 7 lines · Florian Westphal

stateful objects can be updated from the control plane. The transaction logic allocates a temporary object for this purpose.

This object has to be released via nft_obj_destroy, not kfree, since the ->init function was called and it can have side effects beyond memory allocation.

Quoted 5 lines
Quoted 2 lines

Unlike normal NEWOBJ path, the objects module refcount isn't incremented, so add nft_newobj_destroy and use that.

Probably this? .udata and .key is NULL for the update path so kfree should be fine.

Yes, that works too.

We could also ...

Quoted 8 lines
Quoted 8 lines

Review

Quoted 5 lines
(quoted diff) +4 -1
-	module_put(obj->ops->type->owner);
+	/* nf_tables_updobj does not increment module refcount */
+	if (!update)
+		module_put(obj->ops->type->owner);
+

Increment the refcount for update case as well to avoid the special case?

Yes, I also though of this one. I prefer this approach indeed to consolidate this path.

Would you test and submit v3?

Thanks!

Quoted 48 lines

Untested:

net/netfilter/nf_tables_api.c +8 -3
index 3081c4399f10..49060f281342 100644
@@ -6553,10 +6553,13 @@ static int nf_tables_updobj(const struct nft_ctx *ctx,
 	struct nft_trans *trans;
 	int err;
 
+	if (!try_module_get(type->owner))
+		return -ENOENT;
+
 	trans = nft_trans_alloc(ctx, NFT_MSG_NEWOBJ,
 				sizeof(struct nft_trans_obj));
 	if (!trans)
-		return -ENOMEM;
+		goto err_trans;
 
 	newobj = nft_obj_init(ctx, type, attr);
 	if (IS_ERR(newobj)) {
@@ -6573,6 +6576,8 @@ static int nf_tables_updobj(const struct nft_ctx *ctx,
 
 err_free_trans:
 	kfree(trans);
+err_trans:
+	module_put(type->owner);
 	return err;
 }
 
@@ -8185,7 +8190,7 @@ static void nft_obj_commit_update(struct nft_trans *trans)
 	if (obj->ops->update)
 		obj->ops->update(obj, newobj);
 
-	kfree(newobj);
+	nft_obj_destroy(&trans->ctx, newobj);
 }
 
 static void nft_commit_release(struct nft_trans *trans)
@@ -8976,7 +8981,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)
 			break;
 		case NFT_MSG_NEWOBJ:
 			if (nft_trans_obj_update(trans)) {
-				kfree(nft_trans_obj_newobj(trans));
+				nft_obj_destroy(&trans->ctx, nft_trans_obj_newobj(trans));
 				nft_trans_destroy(trans);
 			} else {
 				trans->ctx.table->use--;