* [PATCH nft] intervals: remove check for EXPR_F_REMOVE in remove_element()
@ 2022-04-13 14:50 Pablo Neira Ayuso
0 siblings, 0 replies; only message in thread
From: Pablo Neira Ayuso @ 2022-04-13 14:50 UTC (permalink / raw)
To: netfilter-devel; +Cc: phil
setelem_adjust() checks that EXPR_F_REMOVE is unset already for
the previous element.
Suggested-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
src/intervals.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/intervals.c b/src/intervals.c
index cdda9e38ca5e..3f2bb4bca527 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -265,14 +265,12 @@ static void remove_elem(struct expr *prev, struct set *set, struct expr *purge)
{
struct expr *clone;
- if (!(prev->flags & EXPR_F_REMOVE)) {
- if (prev->flags & EXPR_F_KERNEL) {
- clone = expr_clone(prev);
- list_move_tail(&clone->list, &purge->expressions);
- } else {
- list_del(&prev->list);
- expr_free(prev);
- }
+ if (prev->flags & EXPR_F_KERNEL) {
+ clone = expr_clone(prev);
+ list_move_tail(&clone->list, &purge->expressions);
+ } else {
+ list_del(&prev->list);
+ expr_free(prev);
}
}
--
2.30.2
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-04-13 14:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-13 14:50 [PATCH nft] intervals: remove check for EXPR_F_REMOVE in remove_element() Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).