From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D03722616 for ; Fri, 5 Apr 2024 06:27:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712298451; cv=none; b=UKhjbAxavm24TtNb5O4Ct2k4CUtVjfRLP2IexJrfIRqHlQ7UpPqDBBJxrpBW66H8N8zZyhLT7V7tlqaG0e/L6Ja3CXODQGgiaHSyqAWNoPY9wZYgjJ7KmQZH9G97w8c32gtboO6Mi/se6CcgNyGvSXJ8+i1g1AGpUIEDpFsnDDo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712298451; c=relaxed/simple; bh=hJ9VAkUmVQ1t2LApY8bHCFfscnbaz0MuCHu5hthdMaw=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=H+oHXZbZQg7Giemyrms6sO3gfPWfqIBUlP52Q09OOsTlpSLuZo6fC/moo8vnzsERlvJtRsed5W+sUr9QfTHxZCFwTd5uX7ti6CvX4kFosGYsdHVi9YUyD/DSr6PXnrzgc9kiFpXRGAONxAhCnGhnSc2bHXeNXsnCp/Bd5gcuhQI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mT0xjqqP; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="mT0xjqqP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8F7B0C433F1; Fri, 5 Apr 2024 06:27:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712298451; bh=hJ9VAkUmVQ1t2LApY8bHCFfscnbaz0MuCHu5hthdMaw=; h=Subject:To:Cc:From:Date:From; b=mT0xjqqPEJVHyhBfq3Di7TJ080wqiyP00aUo62eQ3DMC5P63lAl+xRGfJOb0+0waB nJreYcce0hu9WDCiHnnAInHUpIpOch8i4s66B/ORUqwcGLoiLih8t4FkGnb9NyDqKf Q5vzgJMb43RTJw+GPO1rqhTKqQZdMLu7Olg1Mh3U= Subject: FAILED: patch "[PATCH] netfilter: nf_tables: release mutex after nft_gc_seq_end from" failed to apply to 5.4-stable tree To: pablo@netfilter.org,hexrabbit@devco.re Cc: From: Date: Fri, 05 Apr 2024 08:27:18 +0200 Message-ID: <2024040517-progeny-sturdy-eee3@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x 0d459e2ffb541841714839e8228b845458ed3b27 # git commit -s git send-email --to '' --in-reply-to '2024040517-progeny-sturdy-eee3@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 0d459e2ffb541841714839e8228b845458ed3b27 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Thu, 28 Mar 2024 14:23:55 +0100 Subject: [PATCH] netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path The commit mutex should not be released during the critical section between nft_gc_seq_begin() and nft_gc_seq_end(), otherwise, async GC worker could collect expired objects and get the released commit lock within the same GC sequence. nf_tables_module_autoload() temporarily releases the mutex to load module dependencies, then it goes back to replay the transaction again. Move it at the end of the abort phase after nft_gc_seq_end() is called. Cc: stable@vger.kernel.org Fixes: 720344340fb9 ("netfilter: nf_tables: GC transaction race with abort path") Reported-by: Kuan-Ting Chen Signed-off-by: Pablo Neira Ayuso diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index ffcd3213c335..0d432d0674e1 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -10651,11 +10651,6 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action) nf_tables_abort_release(trans); } - if (action == NFNL_ABORT_AUTOLOAD) - nf_tables_module_autoload(net); - else - nf_tables_module_autoload_cleanup(net); - return err; } @@ -10672,6 +10667,14 @@ static int nf_tables_abort(struct net *net, struct sk_buff *skb, WARN_ON_ONCE(!list_empty(&nft_net->commit_list)); + /* module autoload needs to happen after GC sequence update because it + * temporarily releases and grabs mutex again. + */ + if (action == NFNL_ABORT_AUTOLOAD) + nf_tables_module_autoload(net); + else + nf_tables_module_autoload_cleanup(net); + mutex_unlock(&nft_net->commit_mutex); return ret;