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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 97312C433FF for ; Wed, 14 Aug 2019 02:37:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6FAD220665 for ; Wed, 14 Aug 2019 02:37:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565750237; bh=wNh6GWulO7kZkg9hpcN8Ka4IBAvXQO8HkVRjF3YKfnk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XWA8/z+V23Wf4huWhTV2yDdZ+09KksvFamR9crpE7RHa2QoZPT4uyMRE9+g0my0kZ gVeZUq3mTR7yUIYD3zploStDgVdNpPgIF1AACbUpGDK/V5G+M2Zj271yV3XqWMkPiF MelxAMyMKHGPJWWMXRNvrqdN24k4oh5ufstG08fY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728870AbfHNChO (ORCPT ); Tue, 13 Aug 2019 22:37:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:44940 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728027AbfHNCMu (ORCPT ); Tue, 13 Aug 2019 22:12:50 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 29CEF2084F; Wed, 14 Aug 2019 02:12:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565748769; bh=wNh6GWulO7kZkg9hpcN8Ka4IBAvXQO8HkVRjF3YKfnk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tZEbOLujxP7273RymHmQcIRdexMMmzsqDQ13fGhYNZFUIINASJX7bEttvVtlIr3Bs dc66iQXzIBVtv0GRlzBEf3usAmZKrKWuyJt7QLs1kG04e4yPM+7PbNAGFjjF5yIjgD Cw1qZ1/vRqhaB6wRtdfrnq2tK4h+z7WhMUEo8R4s= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jozsef Kadlecsik , Shijie Luo , Sasha Levin , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 057/123] netfilter: ipset: Fix rename concurrency with listing Date: Tue, 13 Aug 2019 22:09:41 -0400 Message-Id: <20190814021047.14828-57-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190814021047.14828-1-sashal@kernel.org> References: <20190814021047.14828-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jozsef Kadlecsik [ Upstream commit 6c1f7e2c1b96ab9b09ac97c4df2bd9dc327206f6 ] Shijie Luo reported that when stress-testing ipset with multiple concurrent create, rename, flush, list, destroy commands, it can result ipset : Broken LIST kernel message: missing DATA part! error messages and broken list results. The problem was the rename operation was not properly handled with respect of listing. The patch fixes the issue. Reported-by: Shijie Luo Signed-off-by: Jozsef Kadlecsik Signed-off-by: Sasha Levin --- net/netfilter/ipset/ip_set_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c index 16afa0df4004d..e103c875383a5 100644 --- a/net/netfilter/ipset/ip_set_core.c +++ b/net/netfilter/ipset/ip_set_core.c @@ -1161,7 +1161,7 @@ static int ip_set_rename(struct net *net, struct sock *ctnl, return -ENOENT; write_lock_bh(&ip_set_ref_lock); - if (set->ref != 0) { + if (set->ref != 0 || set->ref_netlink != 0) { ret = -IPSET_ERR_REFERENCED; goto out; } -- 2.20.1