From 654b51ab84cf10591eba1c443e6d65bf2de35c37 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 12 Jul 2014 14:30:11 +0200 Subject: mnl: immediately return on errors in mnl_nft_ruleset_dump() If this fails to fetch any of the objects, stop handling inmediately. Signed-off-by: Pablo Neira Ayuso --- src/mnl.c | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/mnl.c b/src/mnl.c index a8161066..a843fdcf 100644 --- a/src/mnl.c +++ b/src/mnl.c @@ -908,41 +908,42 @@ struct nft_ruleset *mnl_nft_ruleset_dump(struct mnl_socket *nf_sock, memory_allocation_error(); t = mnl_nft_table_dump(nf_sock, family); - if (t != NULL) - nft_ruleset_attr_set(rs, NFT_RULESET_ATTR_TABLELIST, t); + if (t == NULL) + goto err; + + nft_ruleset_attr_set(rs, NFT_RULESET_ATTR_TABLELIST, t); c = mnl_nft_chain_dump(nf_sock, family); - if (c != NULL) - nft_ruleset_attr_set(rs, NFT_RULESET_ATTR_CHAINLIST, c); + if (c == NULL) + goto err; + + nft_ruleset_attr_set(rs, NFT_RULESET_ATTR_CHAINLIST, c); sl = mnl_nft_set_dump(nf_sock, family, NULL); - if (sl != NULL) { - i = nft_set_list_iter_create(sl); - s = nft_set_list_iter_next(i); - while (s != NULL) { - ret = mnl_nft_setelem_get(nf_sock, s); - if (ret != 0) - goto out; + if (sl == NULL) + goto err; - s = nft_set_list_iter_next(i); - } - nft_set_list_iter_destroy(i); + i = nft_set_list_iter_create(sl); + s = nft_set_list_iter_next(i); + while (s != NULL) { + ret = mnl_nft_setelem_get(nf_sock, s); + if (ret < 0) + goto err; - nft_ruleset_attr_set(rs, NFT_RULESET_ATTR_SETLIST, sl); + s = nft_set_list_iter_next(i); } + nft_set_list_iter_destroy(i); + + nft_ruleset_attr_set(rs, NFT_RULESET_ATTR_SETLIST, sl); r = mnl_nft_rule_dump(nf_sock, family); - if (r != NULL) - nft_ruleset_attr_set(rs, NFT_RULESET_ATTR_RULELIST, r); + if (r == NULL) + goto err; - if (!(nft_ruleset_attr_is_set(rs, NFT_RULESET_ATTR_TABLELIST)) && - !(nft_ruleset_attr_is_set(rs, NFT_RULESET_ATTR_CHAINLIST)) && - !(nft_ruleset_attr_is_set(rs, NFT_RULESET_ATTR_SETLIST)) && - !(nft_ruleset_attr_is_set(rs, NFT_RULESET_ATTR_RULELIST))) - goto out; + nft_ruleset_attr_set(rs, NFT_RULESET_ATTR_RULELIST, r); return rs; -out: +err: nft_ruleset_free(rs); return NULL; } -- cgit v1.2.3