Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4242CC433EF for ; Wed, 13 Apr 2022 14:45:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234521AbiDMOsM (ORCPT ); Wed, 13 Apr 2022 10:48:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236226AbiDMOsK (ORCPT ); Wed, 13 Apr 2022 10:48:10 -0400 Received: from mail.netfilter.org (mail.netfilter.org [217.70.188.207]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 23A1E63BCE for ; Wed, 13 Apr 2022 07:45:49 -0700 (PDT) Date: Wed, 13 Apr 2022 16:45:46 +0200 From: Pablo Neira Ayuso To: Phil Sutter , netfilter-devel@vger.kernel.org Subject: Re: [PATCH nft,v4 7/7] intervals: support to partial deletion with automerge Message-ID: References: <20220412144711.93354-1-pablo@netfilter.org> <20220412144711.93354-8-pablo@netfilter.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org On Wed, Apr 13, 2022 at 04:38:02PM +0200, Phil Sutter wrote: > On Wed, Apr 13, 2022 at 04:27:07PM +0200, Pablo Neira Ayuso wrote: > [...] > > > The one with EXPR_F_REMOVE comes *after* the one to be removed, right? > > > > Right, the other way around actually. > > > > > My question again: Is it possible for 'prev' to have EXPR_F_REMOVE set? > > > Maybe I miss something, but to me it looks like not although the code > > > expects it. > > > > prev never has EXPR_F_REMOVE, so it points to an existing element. > > So below change should be fine? Yes, setelem_adjust() always checks for if (!(prev->flags & EXPR_F_REMOVE)) Your patch looks correct to me. > diff --git a/src/intervals.c b/src/intervals.c > index 451bc4dd4dd45..c0077c06880ff 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); > } > } > > @@ -360,18 +358,15 @@ static int setelem_adjust(struct set *set, struct expr *add, struct expr *purge, > { > if (mpz_cmp(prev_range->low, range->low) == 0 && > mpz_cmp(prev_range->high, range->high) > 0) { > - if (!(prev->flags & EXPR_F_REMOVE) && > - i->flags & EXPR_F_REMOVE) > + if (i->flags & EXPR_F_REMOVE) > adjust_elem_left(set, prev, i, add, purge); > } else if (mpz_cmp(prev_range->low, range->low) < 0 && > mpz_cmp(prev_range->high, range->high) == 0) { > - if (!(prev->flags & EXPR_F_REMOVE) && > - i->flags & EXPR_F_REMOVE) > + if (i->flags & EXPR_F_REMOVE) > adjust_elem_right(set, prev, i, add, purge); > } else if (mpz_cmp(prev_range->low, range->low) < 0 && > mpz_cmp(prev_range->high, range->high) > 0) { > - if (!(prev->flags & EXPR_F_REMOVE) && > - i->flags & EXPR_F_REMOVE) > + if (i->flags & EXPR_F_REMOVE) > split_range(set, prev, i, add, purge); > } else { > return -1; > @@ -417,8 +412,7 @@ 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 (!(prev->flags & EXPR_F_REMOVE) && > - i->flags & EXPR_F_REMOVE) { > + if (i->flags & EXPR_F_REMOVE) { > list_move_tail(&prev->list, &purge->expressions); > list_del(&i->list); > expr_free(i);