From: Pablo Neira Ayuso Date: Tue, 12 Jul 2016 15:00:43 +0000 (+0200) Subject: netlink_linearize: skip NFTNL_EXPR_DYNSET_TIMEOUT attribute if timeout is unset X-Git-Tag: v0.7~149 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=771da8b3ece0c78736f1af0228709d22d75190e7;p=thirdparty%2Fnftables.git netlink_linearize: skip NFTNL_EXPR_DYNSET_TIMEOUT attribute if timeout is unset Otherwise kernel bails out with EINVAL in case that the sets got no timeout flag. Signed-off-by: Pablo Neira Ayuso --- diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c index 01a85d07..f4db685e 100644 --- a/src/netlink_linearize.c +++ b/src/netlink_linearize.c @@ -1027,8 +1027,9 @@ static void netlink_gen_set_stmt(struct netlink_linearize_ctx *ctx, nle = alloc_nft_expr("dynset"); netlink_put_register(nle, NFTNL_EXPR_DYNSET_SREG_KEY, sreg_key); - nftnl_expr_set_u64(nle, NFTNL_EXPR_DYNSET_TIMEOUT, - stmt->set.key->timeout); + if (stmt->set.key->timeout > 0) + nftnl_expr_set_u64(nle, NFTNL_EXPR_DYNSET_TIMEOUT, + stmt->set.key->timeout); nftnl_expr_set_u32(nle, NFTNL_EXPR_DYNSET_OP, stmt->set.op); nftnl_expr_set_str(nle, NFTNL_EXPR_DYNSET_SET_NAME, set->handle.set); nftnl_expr_set_u32(nle, NFTNL_EXPR_DYNSET_SET_ID, set->handle.set_id);