From 8f4de3888ce74607d4754fe5a1a8f470af409c09 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 10 Jun 2016 14:30:56 +0200 Subject: src: return value on setters that internally allocate memory So the client can bail out of memory allocation errors. Or in case of daemon, make sure things are left in consistent state before bailing out. Signed-off-by: Pablo Neira Ayuso --- src/expr.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/expr.c') diff --git a/src/expr.c b/src/expr.c index ed07dc4..f802725 100644 --- a/src/expr.c +++ b/src/expr.c @@ -60,18 +60,18 @@ bool nftnl_expr_is_set(const struct nftnl_expr *expr, uint16_t type) } EXPORT_SYMBOL_ALIAS(nftnl_expr_is_set, nft_rule_expr_is_set); -void -nftnl_expr_set(struct nftnl_expr *expr, uint16_t type, - const void *data, uint32_t data_len) +int nftnl_expr_set(struct nftnl_expr *expr, uint16_t type, + const void *data, uint32_t data_len) { switch(type) { case NFTNL_EXPR_NAME: /* cannot be modified */ - return; + return 0; default: if (expr->ops->set(expr, type, data, data_len) < 0) - return; + return -1; } expr->flags |= (1 << type); + return 0; } EXPORT_SYMBOL_ALIAS(nftnl_expr_set, nft_rule_expr_set); @@ -103,10 +103,9 @@ nftnl_expr_set_u64(struct nftnl_expr *expr, uint16_t type, uint64_t data) } EXPORT_SYMBOL_ALIAS(nftnl_expr_set_u64, nft_rule_expr_set_u64); -void -nftnl_expr_set_str(struct nftnl_expr *expr, uint16_t type, const char *str) +int nftnl_expr_set_str(struct nftnl_expr *expr, uint16_t type, const char *str) { - nftnl_expr_set(expr, type, str, strlen(str)+1); + return nftnl_expr_set(expr, type, str, strlen(str) + 1); } EXPORT_SYMBOL_ALIAS(nftnl_expr_set_str, nft_rule_expr_set_str); -- cgit v1.2.3