diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2022-04-14 18:16:31 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2022-04-18 15:03:28 +0200 |
| commit | 3b7b22aed894fa1a8495d654d215a335051f6bf1 (patch) | |
| tree | e8b3e72b4010039323aa1444df853fd21ce97994 /src | |
| parent | ea31855d73b75445ab4df51eaf75ad0b21f5c506 (diff) | |
intervals: add elements with EXPR_F_KERNEL to purge list only
Do not add elements to purge list which are not in the kernel,
otherwise, bogus ENOENT is reported.
Fixes: 3e8d934e4f722 ("intervals: support to partial deletion with automerge")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/intervals.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/intervals.c b/src/intervals.c index a8fada9b..590a2967 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -329,8 +329,10 @@ static void split_range(struct set *set, struct expr *prev, struct expr *i, { struct expr *clone; - clone = expr_clone(prev); - list_move_tail(&clone->list, &purge->expressions); + if (prev->flags & EXPR_F_KERNEL) { + clone = expr_clone(prev); + list_move_tail(&clone->list, &purge->expressions); + } prev->flags &= ~EXPR_F_KERNEL; clone = expr_clone(prev); @@ -413,7 +415,9 @@ static int setelem_delete(struct list_head *msgs, struct set *set, if (mpz_cmp(prev_range.low, range.low) == 0 && mpz_cmp(prev_range.high, range.high) == 0) { if (i->flags & EXPR_F_REMOVE) { - list_move_tail(&prev->list, &purge->expressions); + if (prev->flags & EXPR_F_KERNEL) + list_move_tail(&prev->list, &purge->expressions); + list_del(&i->list); expr_free(i); } |