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 EEBCBC433F5 for ; Wed, 13 Apr 2022 14:54:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236171AbiDMO5I (ORCPT ); Wed, 13 Apr 2022 10:57:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236346AbiDMO5G (ORCPT ); Wed, 13 Apr 2022 10:57:06 -0400 Received: from mail.netfilter.org (mail.netfilter.org [217.70.188.207]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A7B2F64736 for ; Wed, 13 Apr 2022 07:54:41 -0700 (PDT) Date: Wed, 13 Apr 2022 16:54:38 +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:47:07PM +0200, Pablo Neira Ayuso wrote: > 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? > > Wait. > > > diff --git a/src/intervals.c b/src/intervals.c > > index 451bc4dd4dd45..c0077c06880ff 100644 > > --- a/src/intervals.c > > +++ b/src/intervals.c > [...] > > @@ -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) > > This chunk is not correct. > > User might ask to delete an element which does not exist. > > Then, you might find two consecutive EXPR_F_REMOVE. > > Only the initial chunk in this patch is fine. Wait, you mean prev is always !EXPR_F_REMOVE, then this should be fine.