diff mbox series

netfilter: nf_tables: fix error code in nf_tables_updobj()

Message ID 20220224150130.GA6856@kili (mailing list archive)
State Awaiting Upstream
Delegated to: Netdev Maintainers
Headers show
Series netfilter: nf_tables: fix error code in nf_tables_updobj() | expand

Checks

Context Check Description
netdev/tree_selection success Guessing tree name failed - patch did not apply

Commit Message

Dan Carpenter Feb. 24, 2022, 3:01 p.m. UTC 
Set the error code to -ENOMEM instead of leaving it uninitialized.

Fixes: 33170d18fd2c ("netfilter: nf_tables: fix memory leak during stateful obj update")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
This presumably goes through the netfilter tree.

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

Comments

Florian Westphal Feb. 24, 2022, 3:08 p.m. UTC | #1 
Dan Carpenter <dan.carpenter@oracle.com> wrote:
> Set the error code to -ENOMEM instead of leaving it uninitialized.
> 
> Fixes: 33170d18fd2c ("netfilter: nf_tables: fix memory leak during stateful obj update")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Correct, but this commit no longer exists, it was replaced by
dad3bdeef45f81a6e90204bcc85360bb76eccec7,
"netfilter: nf_tables: fix memory leak during stateful obj update"

... which sets err to -ENOMEM.
diff mbox series

Patch

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 49060f281342..d0d2339e7c89 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -6558,8 +6558,10 @@  static int nf_tables_updobj(const struct nft_ctx *ctx,
 
 	trans = nft_trans_alloc(ctx, NFT_MSG_NEWOBJ,
 				sizeof(struct nft_trans_obj));
-	if (!trans)
+	if (!trans) {
+		err = -ENOMEM;
 		goto err_trans;
+	}
 
 	newobj = nft_obj_init(ctx, type, attr);
 	if (IS_ERR(newobj)) {