| Message ID | 20200430144359.1551-1-pablo@netfilter.org |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
| Series | [nft] rule: fix element cache update in __do_add_setelems() | expand |
diff --git a/src/rule.c b/src/rule.c index 9e80c0251947..23b1cbfc8fb2 100644 --- a/src/rule.c +++ b/src/rule.c @@ -1564,7 +1564,7 @@ static int __do_add_setelems(struct netlink_ctx *ctx, struct set *set, return -1; if (!set_is_anonymous(set->flags) && - set->init != NULL && + set->init != NULL && set->init != expr && set->flags & NFT_SET_INTERVAL && set->desc.field_count <= 1) { interval_map_decompose(expr);
The set->init and expr arguments might actually refer to the same list of elements. Skip set element cache update introduced by dd44081d91ce ("segtree: Fix add and delete of element in same batch") otherwise list_splice_tail_init() actually operates with the same list as arguments. Valgrind reports this problem as a memleak since the result of this operation was an empty set element list. Fixes: dd44081d91ce ("segtree: Fix add and delete of element in same batch") Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- src/rule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)