Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp2932947iob; Fri, 6 May 2022 13:43:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxNBcw+aywcAj2X5oRci8QQD7vgM2psIIXDWULTS7OG/Y75iMXfV9pkGJKmLLwd0vuMb2n2 X-Received: by 2002:a05:6a00:e8e:b0:4fa:a52f:59cf with SMTP id bo14-20020a056a000e8e00b004faa52f59cfmr5333264pfb.84.1651869782583; Fri, 06 May 2022 13:43:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651869782; cv=none; d=google.com; s=arc-20160816; b=JdheGYNdN5ca05UJDfLqBKKOZ01GUdEvMcgViPOucovtUdf92lmVNqhHwEjl/+rSlY OhdMUUw8TuMvuNTOggSyyJ3mycTBcP/IyUMRk7OUj443yTpmXeWfc20kwxGMfOL/+d8Y YoR2s+QK8hZ/Bxuku9wut6aVX51F3wUqeR+wqbUb+DQ96JNbqGuIgr3CuUydnZuQm0GV Ha2jQwxY3lSJutjzUF2nl71A2h4N2rLA2d+YUh5H6s0yD+LIH5fwKClEk/fTg9FHk9Hg njmnnID+0D1tdXa+loeUlWZR1Te0bpIm/GerMAMh5t1a2R6Lh1Ysp35IVs4bcXGWXANv yJ/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=H2QkCXRUbBfnGxpFfnEq5YAOODOgopAoK1Amaz6er3Q=; b=lUDJJGJmTJdHePi/z5X7lagVLUMw4R3dKBVkxNOBCy0pj0W6+TiDF1JjnB+R9GPR1h 3th51SpFT8wi1eYLHm5X1DEQyERnYbFmhdoeUpe4951Frd4YeT3NFy4D+DM5SzWCmvR0 NTJx0NEpnRFiiKLS0YqL61EpyiJIPNEl9k3Hvr3ORcDOGaqL4hCYNDmT4rfvhdV5o5O0 M1jONLQVcKkYGRtRWZ21qfFXUyFSgVTD6QCndEfERYM5Y4fx27NtEjFcAWS7Y4hbYX56 pwDhAEE0ltQRlfUWZ4ccYH/KMQUZkseRRfbh0tN36s6XWfelUxIZuswEw+O3eR+XnRgS IuIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DQeJO8cM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b4-20020a1709027e0400b00156b24c4bb6si2997276plm.120.2022.05.06.13.42.45; Fri, 06 May 2022 13:43:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DQeJO8cM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358792AbiEDRfS (ORCPT + 99 others); Wed, 4 May 2022 13:35:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357062AbiEDRJz (ORCPT ); Wed, 4 May 2022 13:09:55 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA83D47571; Wed, 4 May 2022 09:56:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 65D0F618DF; Wed, 4 May 2022 16:56:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A7AD6C385C2; Wed, 4 May 2022 16:56:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683417; bh=eidVBpEHpfCZhtqWZN0t3L727DuGTceR+6ii9207lXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DQeJO8cMOMA5jNK5Rvc24NFJtJp0R55vUBGGtnoReL3Pq9nYOGgozpH7Ivs25o3pD kzcEXSCDGJkTaqj14FXCmUKCSC75wQoEefiHRQyEugCyb8SRrburcFq/qG8SgBfsEr pm7U6phfpKPlGmoGkkuHQEDP1xdRh2P3GpZtdjrQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pablo Neira Ayuso , Stefano Brivio , Sasha Levin Subject: [PATCH 5.17 102/225] netfilter: nft_set_rbtree: overlap detection with element re-addition after deletion Date: Wed, 4 May 2022 18:45:40 +0200 Message-Id: <20220504153119.811799595@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pablo Neira Ayuso [ Upstream commit babc3dc9524f0bcb5a0ec61f3c3639b11508fad6 ] This patch fixes spurious EEXIST errors. Extend d2df92e98a34 ("netfilter: nft_set_rbtree: handle element re-addition after deletion") to deal with elements with same end flags in the same transation. Reset the overlap flag as described by 7c84d41416d8 ("netfilter: nft_set_rbtree: Detect partial overlaps on insertion"). Fixes: 7c84d41416d8 ("netfilter: nft_set_rbtree: Detect partial overlaps on insertion") Fixes: d2df92e98a34 ("netfilter: nft_set_rbtree: handle element re-addition after deletion") Signed-off-by: Pablo Neira Ayuso Reviewed-by: Stefano Brivio Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nft_set_rbtree.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/netfilter/nft_set_rbtree.c b/net/netfilter/nft_set_rbtree.c index d600a566da32..7325bee7d144 100644 --- a/net/netfilter/nft_set_rbtree.c +++ b/net/netfilter/nft_set_rbtree.c @@ -349,7 +349,11 @@ static int __nft_rbtree_insert(const struct net *net, const struct nft_set *set, *ext = &rbe->ext; return -EEXIST; } else { - p = &parent->rb_left; + overlap = false; + if (nft_rbtree_interval_end(rbe)) + p = &parent->rb_left; + else + p = &parent->rb_right; } } -- 2.35.1