diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-06-10 14:34:10 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-06-15 13:44:59 +0200 |
| commit | 23c2ef2f9812a04c3bd8248de70cad37a176550a (patch) | |
| tree | 724bf1aefff8cb9c4b00779e0b327a04098d7d68 /src | |
| parent | 30f73a954d630729e3618d57c4e5d47a39300a15 (diff) | |
chain: dynamically allocate name
Just in case we ever support chain with larger names in the future,
this will ensure the library doesn't break. Although I don't expect
allocating more bytes for this anytime soon, but let's be conservative
here.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/chain.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/src/chain.c b/src/chain.c index 8cb3cf8..f55dfa1 100644 --- a/src/chain.c +++ b/src/chain.c @@ -32,7 +32,7 @@ struct nftnl_chain { struct list_head head; - char name[NFT_CHAIN_MAXNAMELEN]; + const char *name; const char *type; const char *table; const char *dev; @@ -95,13 +95,14 @@ EXPORT_SYMBOL_ALIAS(nftnl_chain_alloc, nft_chain_alloc); void nftnl_chain_free(const struct nftnl_chain *c) { + if (c->flags & (1 << NFTNL_CHAIN_NAME)) + xfree(c->name); if (c->flags & (1 << NFTNL_CHAIN_TABLE)) xfree(c->table); if (c->flags & (1 << NFTNL_CHAIN_TYPE)) xfree(c->type); if (c->flags & (1 << NFTNL_CHAIN_DEV)) xfree(c->dev); - xfree(c); } EXPORT_SYMBOL_ALIAS(nftnl_chain_free, nft_chain_free); @@ -118,6 +119,9 @@ void nftnl_chain_unset(struct nftnl_chain *c, uint16_t attr) return; switch (attr) { + case NFTNL_CHAIN_NAME: + xfree(c->name); + break; case NFTNL_CHAIN_TABLE: xfree(c->table); break; @@ -126,7 +130,6 @@ void nftnl_chain_unset(struct nftnl_chain *c, uint16_t attr) case NFTNL_CHAIN_TYPE: xfree(c->type); break; - case NFTNL_CHAIN_NAME: case NFTNL_CHAIN_HOOKNUM: case NFTNL_CHAIN_PRIO: case NFTNL_CHAIN_POLICY: @@ -164,7 +167,12 @@ int nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr, switch(attr) { case NFTNL_CHAIN_NAME: - strncpy(c->name, data, NFT_CHAIN_MAXNAMELEN); + if (c->flags & (1 << NFTNL_CHAIN_NAME)) + xfree(c->name); + + c->name = strdup(data); + if (!c->name) + return -1; break; case NFTNL_CHAIN_TABLE: if (c->flags & (1 << NFTNL_CHAIN_TABLE)) @@ -528,8 +536,11 @@ int nftnl_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_chain *c) return -1; if (tb[NFTA_CHAIN_NAME]) { - strncpy(c->name, mnl_attr_get_str(tb[NFTA_CHAIN_NAME]), - NFT_CHAIN_MAXNAMELEN); + if (c->flags & (1 << NFTNL_CHAIN_NAME)) + xfree(c->name); + c->name = strdup(mnl_attr_get_str(tb[NFTA_CHAIN_NAME])); + if (!c->name) + return -1; c->flags |= (1 << NFTNL_CHAIN_NAME); } if (tb[NFTA_CHAIN_TABLE]) { |