summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Falgueras García <carlosfg@riseup.net>2015-08-05 12:23:34 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2015-08-18 01:52:01 +0200
commit6e188637782c6c62c7bcade808e59d17639d677d (patch)
tree658c9400a8f7beb07b00b445b9a7d0eba6bcea89
parent0edeb667a2cfdd36d8c89de88e1a446595ce95d8 (diff)
src: fix memory leaks at nft_[object]_nlmsg_parse
Free object attributes before overwrite it. Fix 'nlmsg_parse' methods of following objects: 'table', 'chain', 'rule', 'set' and 'set_element'. Signed-off-by: Carlos Falgueras García <carlosfg@riseup.net> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--src/chain.c2
-rw-r--r--src/rule.c2
-rw-r--r--src/set.c2
-rw-r--r--src/set_elem.c2
-rw-r--r--src/table.c1
5 files changed, 9 insertions, 0 deletions
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);
}