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 D3CFCC433FF for ; Wed, 14 Aug 2019 02:21:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A24432063F for ; Wed, 14 Aug 2019 02:21:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565749313; bh=t9nh+fDzLR+lZdA6UiSx0HNU8IeirI5p/eg+9P6Z6ok=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qq7IoN/dF2NslVqDzvd42UdshgGuPX+EReqz58mNDzku+4mFsDJBdM6Jemh8rptt0 FEc5pj8NY2InZW7Cb2MXq9vtIQ0pDsE7cAOlX0l+R4KIIOXizBRHcJ+zDSXvtQpq6T Tcowll4NXUJyMZYwEgoxdgbo3548kkZsU+RcsgrQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729619AbfHNCTD (ORCPT ); Tue, 13 Aug 2019 22:19:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:49934 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729606AbfHNCTC (ORCPT ); Tue, 13 Aug 2019 22:19:02 -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 58B4B20843; Wed, 14 Aug 2019 02:19:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565749141; bh=t9nh+fDzLR+lZdA6UiSx0HNU8IeirI5p/eg+9P6Z6ok=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fCmImOED50zP7P7cPfG8cjqXHB3RdLTNzRuzGAVS2Fa3eKQG7mUiv8TaVogKrniUt 6LIyWVXZZxAVAW39Ms9mhQuGaFJmWXzRS1i9HDG+4sIRDWtewoJYdyTABz+Gxqlizo PwaLY74QlBep4Eb3t4qa+uvdvkK/8LiLnSZ1UMgY= 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 4.14 16/44] netfilter: ipset: Fix rename concurrency with listing Date: Tue, 13 Aug 2019 22:18:05 -0400 Message-Id: <20190814021834.16662-16-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190814021834.16662-1-sashal@kernel.org> References: <20190814021834.16662-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@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 a3f1dc7cf5382..dbf17d3596a69 100644 --- a/net/netfilter/ipset/ip_set_core.c +++ b/net/netfilter/ipset/ip_set_core.c @@ -1128,7 +1128,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