From dd44081d91ceaead0a9730f1ab5c8041a4d905e2 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 21 Nov 2019 11:41:24 +0100 Subject: segtree: Fix add and delete of element in same batch The commit this fixes accidentally broke a rather exotic use-case which is but used in set-simple.t of tests/monitor: | # nft 'add element t s { 22-25 }; delete element t s { 22-25 }' Since ranges are now checked for existence in userspace before delete command is submitted to kernel, the second command above was rejected because the range in question wasn't present in cache yet. Fix this by adding new interval set elements to cache after creating the batch job for them. Fixes: decc12ec2dc31 ("segtree: Check ranges when deleting elements") Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- src/rule.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src') diff --git a/src/rule.c b/src/rule.c index 4abc13c9..d985d3a2 100644 --- a/src/rule.c +++ b/src/rule.c @@ -1511,6 +1511,14 @@ static int __do_add_setelems(struct netlink_ctx *ctx, struct set *set, if (mnl_nft_setelem_add(ctx, set, expr, flags) < 0) return -1; + if (set->init != NULL && + set->flags & NFT_SET_INTERVAL) { + interval_map_decompose(expr); + list_splice_tail_init(&expr->expressions, &set->init->expressions); + set->init->size += expr->size; + expr->size = 0; + } + return 0; } -- cgit v1.2.3