From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 3 Oct 2018 14:05:32 +0000 (+0200)
Subject: rule: fix memleak in do_get_setelems()
X-Git-Tag: v0.9.1~249
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=406d17db7e02f78d258edb38ac8571112ef8c767;p=thirdparty%2Fnftables.git

rule: fix memleak in do_get_setelems()

Release set and elements in case of error.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/src/rule.c b/src/rule.c
index e6d61b67..6d027c26 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -2190,17 +2190,15 @@ static int do_get_setelems(struct netlink_ctx *ctx, struct cmd *cmd,
 	/* Fetch from kernel the elements that have been requested .*/
 	err = netlink_get_setelem(ctx, &cmd->handle, &cmd->location,
 				  table, new_set, init);
-	if (err < 0)
-		return err;
-
-	__do_list_set(ctx, cmd, table, new_set);
+	if (err >= 0)
+		__do_list_set(ctx, cmd, table, new_set);
 
 	if (set->flags & NFT_SET_INTERVAL)
 		expr_free(init);
 
 	set_free(new_set);
 
-	return 0;
+	return err;
 }
 
 static int do_command_get(struct netlink_ctx *ctx, struct cmd *cmd)