Skip to contentSkip to conversation

libnftables: memleak when list of commands is empty

PATCH In review Pablo Neira Ayuso 2 participants 2 messages Sep 27, 2019 netfilter

lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

PATCH v2 1/1 libnftables: memleak when list of commands is empty

==9946== 200,807 (40 direct, 200,767 indirect) bytes in 1 blocks are definitely lost in loss record 4 of 4

==9946==    at 0x4837B65: calloc (vg_replace_malloc.c:762)
==9946==    by 0x4F28216: nftnl_batch_alloc (batch.c:66)
==9946==    by 0x48A33E8: mnl_batch_init (mnl.c:164)
==9946==    by 0x48A736F: nft_netlink.isra.0 (libnftables.c:29)
==9946==    by 0x48A7D03: nft_run_cmd_from_filename (libnftables.c:508)
==9946==    by 0x10A621: main (main.c:328)
Fixes fc6d0f8b0cb1 ("libnftables: get rid of repeated initialization of netlink_ctx")

---
v2: better commit description and title.

 src/libnftables.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
src/libnftables.c +1 -1
index a19636b22683..e20372438db6 100644
@@ -34,7 +34,7 @@ static int nft_netlink(struct nft_ctx *nft,
 	int ret = 0;
 
 	if (list_empty(cmds))
-		return 0;
+		goto out;
 
 	batch_seqnum = mnl_batch_begin(ctx.batch, mnl_seqnum_alloc(&seqnum));
 	list_for_each_entry(cmd, cmds, list) {
Signature · 1 line
2.11.0
Acked-by on v2 1/1
#1 lore raw
Quoted 9 lines · Pablo Neira Ayuso

==9946== 200,807 (40 direct, 200,767 indirect) bytes in 1 blocks are definitely lost in loss record 4 of 4

==9946==    at 0x4837B65: calloc (vg_replace_malloc.c:762)
==9946==    by 0x4F28216: nftnl_batch_alloc (batch.c:66)
==9946==    by 0x48A33E8: mnl_batch_init (mnl.c:164)
==9946==    by 0x48A736F: nft_netlink.isra.0 (libnftables.c:29)
==9946==    by 0x48A7D03: nft_run_cmd_from_filename (libnftables.c:508)
==9946==    by 0x10A621: main (main.c:328)
Fixes fc6d0f8b0cb1 ("libnftables: get rid of repeated initialization of netlink_ctx")

Whoops. Thanks for fixing this.

Quoted 1 line
Quoted 20 lines

---
v2: better commit description and title.

 src/libnftables.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
src/libnftables.c +1 -2
index a19636b22683..e20372438db6 100644
@@ -34,7 +34,7 @@ static int nft_netlink(struct nft_ctx *nft,
 	int ret = 0;
 
 	if (list_empty(cmds))
-		return 0;
+		goto out;
 
 	batch_seqnum = mnl_batch_begin(ctx.batch, mnl_seqnum_alloc(&seqnum));
 	list_for_each_entry(cmd, cmds, list) {
--
Quoted 3 lines

2.11.0

J.