From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org, Phil Sutter <psutter@redhat.com>
Subject: [libnftnl PATCH 1/7] set: prevent memleak in nftnl_jansson_parse_set_info()
Date: Fri, 12 Aug 2016 01:33:33 +0200 [thread overview]
Message-ID: <1470958419-32602-2-git-send-email-phil@nwl.cc> (raw)
In-Reply-To: <1470958419-32602-1-git-send-email-phil@nwl.cc>
From: Phil Sutter <psutter@redhat.com>
During list populating, in error case the function returns without
freeing the newly allocated 'elem' object, thereby losing any references
to it.
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
src/set.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/set.c b/src/set.c
index 5f7245855db53..7a41e8caeb3c0 100644
--- a/src/set.c
+++ b/src/set.c
@@ -610,12 +610,12 @@ static int nftnl_jansson_parse_set_info(struct nftnl_set *s, json_t *tree,
return -1;
json_elem = json_array_get(array, i);
- if (json_elem == NULL)
- return -1;
-
- if (nftnl_jansson_set_elem_parse(elem,
- json_elem, err) < 0)
+ if (json_elem == NULL ||
+ nftnl_jansson_set_elem_parse(elem,
+ json_elem, err) < 0) {
+ free(elem);
return -1;
+ }
list_add_tail(&elem->head, &s->element_list);
}
--
2.8.2
next prev parent reply other threads:[~2016-08-11 23:34 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-11 23:33 [libnftnl PATCH 0/7] A bunch of covscan detected fixes Phil Sutter
2016-08-11 23:33 ` Phil Sutter [this message]
2016-08-11 23:33 ` [libnftnl PATCH 2/7] ruleset: Prevent memleak in nftnl_ruleset_snprintf_*() functions Phil Sutter
2016-08-11 23:42 ` Pablo Neira Ayuso
2016-08-12 0:44 ` Phil Sutter
2016-08-12 8:38 ` Pablo Neira Ayuso
2016-08-11 23:33 ` [libnftnl PATCH 3/7] expr/ct: prevent array index overrun in ctkey2str() Phil Sutter
2016-08-11 23:33 ` [libnftnl PATCH 4/7] expr/limit: Drop unreachable code in limit_to_type() Phil Sutter
2016-08-11 23:33 ` [libnftnl PATCH 5/7] common: Avoid integer overflow in nftnl_batch_is_supported() Phil Sutter
2016-08-11 23:48 ` Pablo Neira Ayuso
2016-08-11 23:33 ` [libnftnl PATCH 6/7] Avoid returning uninitialized data Phil Sutter
2016-08-11 23:33 ` [libnftnl PATCH 7/7] ruleset: Initialize ctx.flags before calling nftnl_ruleset_ctx_set() Phil Sutter
2016-08-11 23:58 ` [libnftnl PATCH 0/7] A bunch of covscan detected fixes Pablo Neira Ayuso
2016-08-12 0:05 ` Pablo Neira Ayuso
2016-08-12 0:47 ` Phil Sutter
2016-08-12 8:40 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1470958419-32602-2-git-send-email-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=psutter@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).