diff options
author | Phil Sutter <phil@nwl.cc> | 2018-12-20 21:03:30 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-12-21 12:05:05 +0100 |
commit | 8ef66870832d56881703a7798ecdff9e19917b15 (patch) | |
tree | 07477b5f72cf22785ef455a6e2d50e99e6e6f52b /src/flowtable.c | |
parent | 822dc96815e96465822ce4b1187c4b29c06cb7c1 (diff) |
flowtable: Fix memleak in nftnl_flowtable_parse_devs()
Allocated strings in dev_array were not freed. Fix this by freeing them
on error path and assigning them to c->dev_array directly in regular
path.
Fixes: eb58f53372e74 ("src: add flowtable support")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/flowtable.c')
-rw-r--r-- | src/flowtable.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/flowtable.c b/src/flowtable.c index 14cb12f..31b3c1b 100644 --- a/src/flowtable.c +++ b/src/flowtable.c @@ -364,7 +364,7 @@ static int nftnl_flowtable_parse_devs(struct nlattr *nest, mnl_attr_for_each_nested(attr, nest) { if (mnl_attr_get_type(attr) != NFTA_DEVICE_NAME) - return -1; + goto err; dev_array[len++] = strdup(mnl_attr_get_str(attr)); if (len >= 8) break; @@ -375,14 +375,18 @@ static int nftnl_flowtable_parse_devs(struct nlattr *nest, c->dev_array = calloc(len + 1, sizeof(char *)); if (!c->dev_array) - return -1; + goto err; c->dev_array_len = len; for (i = 0; i < len; i++) - c->dev_array[i] = strdup(dev_array[i]); + c->dev_array[i] = dev_array[i]; return 0; +err: + while (len--) + xfree(dev_array[len]); + return -1; } static int nftnl_flowtable_parse_hook(struct nlattr *attr, struct nftnl_flowtable *c) |