From: "Carlos Falgueras García" <carlosfg@riseup.net>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH libnftnl] src: fix memory leaks at nft_[object]_nlmsg_parse
Date: Wed, 5 Aug 2015 12:23:34 +0200 [thread overview]
Message-ID: <1438770214-3064-1-git-send-email-carlosfg@riseup.net> (raw)
Free object attributes before overwrite it. Fix 'nlmsg_parse' methods of
following objects: 'table', 'chain', 'rule', 'set' and 'set_element'.
---
src/chain.c | 2 ++
src/rule.c | 2 ++
src/set.c | 2 ++
src/set_elem.c | 2 ++
src/table.c | 1 +
5 files changed, 9 insertions(+)
diff --git a/src/chain.c b/src/chain.c
index ed9d9e4..4f9c6b7 100644
--- a/src/chain.c
+++ b/src/chain.c
@@ -534,6 +534,7 @@ int nft_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_chain *c)
c->flags |= (1 << NFT_CHAIN_ATTR_NAME);
}
if (tb[NFTA_CHAIN_TABLE]) {
+ xfree(c->table);
c->table = strdup(mnl_attr_get_str(tb[NFTA_CHAIN_TABLE]));
c->flags |= (1 << NFT_CHAIN_ATTR_TABLE);
}
@@ -560,6 +561,7 @@ int nft_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_chain *c)
c->flags |= (1 << NFT_CHAIN_ATTR_HANDLE);
}
if (tb[NFTA_CHAIN_TYPE]) {
+ xfree(c->type);
c->type = strdup(mnl_attr_get_str(tb[NFTA_CHAIN_TYPE]));
c->flags |= (1 << NFT_CHAIN_ATTR_TYPE);
}
diff --git a/src/rule.c b/src/rule.c
index 04088ed..ebaa3ed 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -425,10 +425,12 @@ int nft_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_rule *r)
return -1;
if (tb[NFTA_RULE_TABLE]) {
+ xfree(r->table);
r->table = strdup(mnl_attr_get_str(tb[NFTA_RULE_TABLE]));
r->flags |= (1 << NFT_RULE_ATTR_TABLE);
}
if (tb[NFTA_RULE_CHAIN]) {
+ xfree(r->chain);
r->chain = strdup(mnl_attr_get_str(tb[NFTA_RULE_CHAIN]));
r->flags |= (1 << NFT_RULE_ATTR_CHAIN);
}
diff --git a/src/set.c b/src/set.c
index b07c4d9..1782f72 100644
--- a/src/set.c
+++ b/src/set.c
@@ -435,10 +435,12 @@ int nft_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set *s)
return -1;
if (tb[NFTA_SET_TABLE]) {
+ xfree(s->table);
s->table = strdup(mnl_attr_get_str(tb[NFTA_SET_TABLE]));
s->flags |= (1 << NFT_SET_ATTR_TABLE);
}
if (tb[NFTA_SET_NAME]) {
+ xfree(s->name);
s->name = strdup(mnl_attr_get_str(tb[NFTA_SET_NAME]));
s->flags |= (1 << NFT_SET_ATTR_NAME);
}
diff --git a/src/set_elem.c b/src/set_elem.c
index 3a799dc..643dd76 100644
--- a/src/set_elem.c
+++ b/src/set_elem.c
@@ -462,11 +462,13 @@ int nft_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set *s)
return -1;
if (tb[NFTA_SET_ELEM_LIST_TABLE]) {
+ xfree(s->table);
s->table =
strdup(mnl_attr_get_str(tb[NFTA_SET_ELEM_LIST_TABLE]));
s->flags |= (1 << NFT_SET_ATTR_TABLE);
}
if (tb[NFTA_SET_ELEM_LIST_SET]) {
+ xfree(s->name);
s->name =
strdup(mnl_attr_get_str(tb[NFTA_SET_ELEM_LIST_SET]));
s->flags |= (1 << NFT_SET_ATTR_NAME);
diff --git a/src/table.c b/src/table.c
index ab0a8ea..09470e0 100644
--- a/src/table.c
+++ b/src/table.c
@@ -229,6 +229,7 @@ int nft_table_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_table *t)
return -1;
if (tb[NFTA_TABLE_NAME]) {
+ xfree(t->name);
t->name = strdup(mnl_attr_get_str(tb[NFTA_TABLE_NAME]));
t->flags |= (1 << NFT_TABLE_ATTR_NAME);
}
--
2.4.6
next reply other threads:[~2015-08-05 10:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-05 10:23 Carlos Falgueras García [this message]
2015-08-17 23:54 ` [PATCH libnftnl] src: fix memory leaks at nft_[object]_nlmsg_parse 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=1438770214-3064-1-git-send-email-carlosfg@riseup.net \
--to=carlosfg@riseup.net \
--cc=netfilter-devel@vger.kernel.org \
/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).