Skip to contentSkip to conversation

intervals: remove check for EXPR_F_REMOVE in remove_element()

PATCH New Pablo Neira Ayuso 1 participant 1 message Apr 13, 2022 netfilter

lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

PATCH 1/1 intervals: remove check for EXPR_F_REMOVE in remove_element()

setelem_adjust() checks that EXPR_F_REMOVE is unset already for the previous element.

---
 src/intervals.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
src/intervals.c +6 -8
index cdda9e38ca5e..3f2bb4bca527 100644
@@ -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);
 	}
 }
 
Signature · 1 line
2.30.2