diff options
| author | Arturo Borrero <arturo.borrero.glez@gmail.com> | 2014-02-26 19:13:26 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-02-27 10:35:08 +0100 |
| commit | cfe671fa741c9669cadc5dfbf9ae63eb440601cf (patch) | |
| tree | eadb2e1a0242a4a49808327efa1e05bc19f8726f /src/chain.c | |
| parent | 313c702ad8700ee5a959d81fd5b2da38e161c278 (diff) | |
src: check if netlink parsing fails
We have to check if mnl_attr_parse() returns an error, which means that it
failed to validate and retrieve the attributes.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/chain.c')
| -rw-r--r-- | src/chain.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/chain.c b/src/chain.c index 33540b1..ca71069 100644 --- a/src/chain.c +++ b/src/chain.c @@ -502,7 +502,9 @@ int nft_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_chain *c) struct nfgenmsg *nfg = mnl_nlmsg_get_payload(nlh); int ret = 0; - mnl_attr_parse(nlh, sizeof(*nfg), nft_chain_parse_attr_cb, tb); + if (mnl_attr_parse(nlh, sizeof(*nfg), nft_chain_parse_attr_cb, tb) < 0) + return -1; + if (tb[NFTA_CHAIN_NAME]) { strncpy(c->name, mnl_attr_get_str(tb[NFTA_CHAIN_NAME]), NFT_CHAIN_MAXNAMELEN); @@ -512,8 +514,11 @@ int nft_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_chain *c) c->table = strdup(mnl_attr_get_str(tb[NFTA_CHAIN_TABLE])); c->flags |= (1 << NFT_CHAIN_ATTR_TABLE); } - if (tb[NFTA_CHAIN_HOOK]) + if (tb[NFTA_CHAIN_HOOK]) { ret = nft_chain_parse_hook(tb[NFTA_CHAIN_HOOK], c); + if (ret < 0) + return ret; + } if (tb[NFTA_CHAIN_POLICY]) { c->policy = ntohl(mnl_attr_get_u32(tb[NFTA_CHAIN_POLICY])); c->flags |= (1 << NFT_CHAIN_ATTR_POLICY); @@ -522,8 +527,11 @@ int nft_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_chain *c) c->use = ntohl(mnl_attr_get_u32(tb[NFTA_CHAIN_USE])); c->flags |= (1 << NFT_CHAIN_ATTR_USE); } - if (tb[NFTA_CHAIN_COUNTERS]) + if (tb[NFTA_CHAIN_COUNTERS]) { ret = nft_chain_parse_counters(tb[NFTA_CHAIN_COUNTERS], c); + if (ret < 0) + return ret; + } if (tb[NFTA_CHAIN_HANDLE]) { c->handle = be64toh(mnl_attr_get_u64(tb[NFTA_CHAIN_HANDLE])); c->flags |= (1 << NFT_CHAIN_ATTR_HANDLE); |