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=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,T_DKIMWL_WL_HIGH,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 EAF53C43219 for ; Thu, 2 May 2019 15:22:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B9D0921479 for ; Thu, 2 May 2019 15:22:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556810534; bh=wvOR1Uv2MR8p49iQslFGEWWv9UDcGrkNlEPhyTw2zP4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rQPHjXmuyhFyw2iLHJGCaPhE46AHvzbErlWyE44rfrT8LZi/OBjdUmQL8h/NUW/xN unwX0Q+SL0TdwuxrrJemffOuYyPVIUcNx6T6gv5VL1JQevn7GENUAfxJZmYIHSO0xW BCjGwpy751Np2+K2jtnRR5U6KkPiyN7z7G23XzqQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726536AbfEBPWO (ORCPT ); Thu, 2 May 2019 11:22:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:37366 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726468AbfEBPWL (ORCPT ); Thu, 2 May 2019 11:22:11 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A16B52081C; Thu, 2 May 2019 15:22:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556810530; bh=wvOR1Uv2MR8p49iQslFGEWWv9UDcGrkNlEPhyTw2zP4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yIP132cYp/x+y7/sEybt54FTZ8BtmpT3h7YznLBk6M1YJSh8M1iwxisRgs0vA7aUP ec2OVAfNsPksK3OKef7tlwx40uH7v9KCQ2KhmgARZpnJcEv2vQTytKDWA1RvS/Y68M /h2J1MUuRn8zhweIknhlEdKQJakwbDG7GGtpPoIg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?V=C3=A1clav=20Zindulka?= , Pablo Neira Ayuso , "Sasha Levin (Microsoft)" Subject: [PATCH 4.9 07/32] netfilter: nft_set_rbtree: check for inactive element after flag mismatch Date: Thu, 2 May 2019 17:20:53 +0200 Message-Id: <20190502143317.550077918@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190502143314.649935114@linuxfoundation.org> References: <20190502143314.649935114@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 05b7639da55f5555b9866a1f4b7e8995232a6323 ] Otherwise, we hit bogus ENOENT when removing elements. Fixes: e701001e7cbe ("netfilter: nft_rbtree: allow adjacent intervals with dynamic updates") Reported-by: Václav Zindulka Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin (Microsoft) --- net/netfilter/nft_set_rbtree.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/netfilter/nft_set_rbtree.c b/net/netfilter/nft_set_rbtree.c index 93820e0d8814..4ee8acded0a4 100644 --- a/net/netfilter/nft_set_rbtree.c +++ b/net/netfilter/nft_set_rbtree.c @@ -191,10 +191,6 @@ static void *nft_rbtree_deactivate(const struct net *net, else if (d > 0) parent = parent->rb_right; else { - if (!nft_set_elem_active(&rbe->ext, genmask)) { - parent = parent->rb_left; - continue; - } if (nft_rbtree_interval_end(rbe) && !nft_rbtree_interval_end(this)) { parent = parent->rb_left; @@ -203,6 +199,9 @@ static void *nft_rbtree_deactivate(const struct net *net, nft_rbtree_interval_end(this)) { parent = parent->rb_right; continue; + } else if (!nft_set_elem_active(&rbe->ext, genmask)) { + parent = parent->rb_left; + continue; } nft_set_elem_change_active(net, set, &rbe->ext); return rbe; -- 2.19.1