src: check if netlink parsing fails
PATCH 1/1 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 <[email protected]>
--- src/chain.c | 17 +++++++++++++---- src/rule.c | 5 ++++- src/set.c | 7 +++++-- src/set_elem.c | 7 ++++++- src/table.c | 6 +++++- 5 files changed, 33 insertions(+), 9 deletions(-)
src/chain.c +13 -4
@@ -447,9 +447,12 @@ int nft_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_chain *c) {struct nlattr *tb[NFTA_CHAIN_MAX +1 ] = {};struct nfgenmsg *nfg =mnl_nlmsg_get_payload (nlh); -int ret =0 ; +int ret; + + ret =mnl_attr_parse (nlh,sizeof (*nfg), nft_chain_parse_attr_cb, tb); +if (ret !=MNL_CB_OK ) +return -1 ; -mnl_attr_parse (nlh,sizeof (*nfg), nft_chain_parse_attr_cb, tb);if (tb[NFTA_CHAIN_NAME ]) {strncpy (c->name,mnl_attr_get_str (tb[NFTA_CHAIN_NAME ]),NFT_CHAIN_MAXNAMELEN );
@@ -459,8 +462,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 -1 ; + }if (tb[NFTA_CHAIN_POLICY ]) { c->policy =ntohl (mnl_attr_get_u32 (tb[NFTA_CHAIN_POLICY ])); c->flags |= (1 <<NFT_CHAIN_ATTR_POLICY );
@@ -469,8 +475,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 -1 ; + }if (tb[NFTA_CHAIN_HANDLE ]) { c->handle =be64toh (mnl_attr_get_u64 (tb[NFTA_CHAIN_HANDLE ])); c->flags |= (1 <<NFT_CHAIN_ATTR_HANDLE );
src/rule.c +4 -1
@@ -412,7 +412,10 @@ int nft_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_rule *r)struct nfgenmsg *nfg =mnl_nlmsg_get_payload (nlh);int ret =0 ; -mnl_attr_parse (nlh,sizeof (*nfg), nft_rule_parse_attr_cb, tb); + ret =mnl_attr_parse (nlh,sizeof (*nfg), nft_rule_parse_attr_cb, tb); +if (ret !=MNL_CB_OK ) +return -1 ; +if (tb[NFTA_RULE_TABLE ]) { r->table =strdup (mnl_attr_get_str (tb[NFTA_RULE_TABLE ])); r->flags |= (1 <<NFT_RULE_ATTR_TABLE );
src/set.c +5 -2
@@ -244,9 +244,12 @@ int nft_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set *s) {struct nlattr *tb[NFTA_SET_MAX +1 ] = {};struct nfgenmsg *nfg =mnl_nlmsg_get_payload (nlh); -int ret =0 ; +int ret; + + ret =mnl_attr_parse (nlh,sizeof (*nfg), nft_set_parse_attr_cb, tb); +if (ret !=MNL_CB_OK ) +return -1 ; -mnl_attr_parse (nlh,sizeof (*nfg), nft_set_parse_attr_cb, tb);if (tb[NFTA_SET_TABLE ]) { s->table =strdup (mnl_attr_get_str (tb[NFTA_SET_TABLE ])); s->flags |= (1 <<NFT_SET_ATTR_TABLE );
src/set_elem.c +6 -1
@@ -252,7 +252,12 @@ static int nft_set_elems_parse2(struct nft_set *s, const struct nlattr *nest)if (e ==NULL )return -1 ; -mnl_attr_parse_nested (nest, nft_set_elem_parse_attr_cb, tb); + ret =mnl_attr_parse_nested (nest, nft_set_elem_parse_attr_cb, tb); +if (ret !=MNL_CB_OK ) { +nft_set_elem_free (e); +return -1 ; + } +if (tb[NFTA_SET_ELEM_FLAGS ]) { e->set_elem_flags =ntohl (mnl_attr_get_u32 (tb[NFTA_SET_ELEM_FLAGS ]));
src/table.c +5 -1
@@ -205,10 +205,14 @@ static int nft_table_parse_attr_cb(const struct nlattr *attr, void *data)int nft_table_nlmsg_parse (const struct nlmsghdr *nlh,struct nft_table *t) { +int ret;struct nlattr *tb[NFTA_TABLE_MAX +1 ] = {};struct nfgenmsg *nfg =mnl_nlmsg_get_payload (nlh); -mnl_attr_parse (nlh,sizeof (*nfg), nft_table_parse_attr_cb, tb); + ret =mnl_attr_parse (nlh,sizeof (*nfg), nft_table_parse_attr_cb, tb); +if (ret !=MNL_CB_OK ) +return -1 ; +if (tb[NFTA_TABLE_NAME ]) { t->name =strdup (mnl_attr_get_str (tb[NFTA_TABLE_NAME ])); t->flags |= (1 <<NFT_TABLE_ATTR_NAME );
Pablo Neira Ayuso
maintainerQuoted 2 lines · Arturo Borrero Gonzalez
We have to check if
mnl_attr_parse()returns an error, which means that it failed to validate and retrieve the attributes.
Applied with minor glitches, please see pushed patch to master.
Thanks a lot Arturo.