From mboxrd@z Thu Jan 1 00:00:00 1970 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 9AF2CC433F5 for ; Thu, 14 Apr 2022 16:51:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231301AbiDNQx1 (ORCPT ); Thu, 14 Apr 2022 12:53:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245342AbiDNQxA (ORCPT ); Thu, 14 Apr 2022 12:53:00 -0400 Received: from mail.netfilter.org (mail.netfilter.org [217.70.188.207]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 336CA139ADE for ; Thu, 14 Apr 2022 09:22:02 -0700 (PDT) From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [PATCH nft 1/2] intervals: add elements with EXPR_F_KERNEL to purge list only Date: Thu, 14 Apr 2022 18:21:57 +0200 Message-Id: <20220414162158.636939-1-pablo@netfilter.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org 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 --- src/intervals.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/intervals.c b/src/intervals.c index a8fada9ba079..590a2967c0f3 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); } -- 2.30.2