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 X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA90AC433DB for ; Tue, 16 Mar 2021 23:56:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ACCBB64E37 for ; Tue, 16 Mar 2021 23:56:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229987AbhCPX4P (ORCPT ); Tue, 16 Mar 2021 19:56:15 -0400 Received: from mail.netfilter.org ([217.70.188.207]:45516 "EHLO mail.netfilter.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229958AbhCPXzs (ORCPT ); Tue, 16 Mar 2021 19:55:48 -0400 Received: from localhost.localdomain (unknown [90.77.255.23]) by mail.netfilter.org (Postfix) with ESMTPSA id B54C46353B for ; Wed, 17 Mar 2021 00:55:45 +0100 (CET) From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [PATCH nft] segtree: release single element already contained in an interval Date: Wed, 17 Mar 2021 00:55:35 +0100 Message-Id: <20210316235535.3329-1-pablo@netfilter.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Before this patch: table ip x { chain y { ip saddr { 1.1.1.1-1.1.1.2, 1.1.1.1 } } } results in: table ip x { chain y { ip saddr { 1.1.1.1 } } } due to incorrect interval merge logic. If the element 1.1.1.1 is already contained in an existing interval 1.1.1.1-1.1.1.2, release it. Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1512 Signed-off-by: Pablo Neira Ayuso --- src/segtree.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/segtree.c b/src/segtree.c index 9aa39e52d8a0..ad199355532e 100644 --- a/src/segtree.c +++ b/src/segtree.c @@ -210,6 +210,12 @@ static int ei_insert(struct list_head *msgs, struct seg_tree *tree, ei = lei; goto err; } + /* single element contained in an existing interval */ + if (mpz_cmp(new->left, new->right) == 0) { + ei_destroy(new); + goto out; + } + /* * The new interval is entirely contained in the same interval, * split it into two parts: @@ -277,7 +283,7 @@ static int ei_insert(struct list_head *msgs, struct seg_tree *tree, } __ei_insert(tree, new); - +out: mpz_clear(p); return 0; -- 2.20.1