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 78F4A1803D for ; Fri, 5 Apr 2024 06:27:21 +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=1712298441; cv=none; b=PrGDs/eicFFz6NLkNZAdKzL7u61vBhecxv/wbmfZZfHUNioyQRCtIhas3qUhWkc5NDuFtARlxDqW466MB6kqatFCnc5yxQO0RAjqld2RKhODj0PqMxbmiplaZUKz7LYqHxp5ZZfjAVyvEFfLqwp2xB+7WSSN50USIv14dJlYgZw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712298441; c=relaxed/simple; bh=OXJLVbctLyBay+lIL1fIR4XWoNl2Q5H4SoCjZDoA5BU=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=JfBC8P4EQ+FwPw5G5Ncjn9NU+Xp8F2d73N3e2sV8vwkGlIuksr6N1V4mKa6Omfhj4lP3qlhZQ1WpjyYR054o0r0Kha9DTocyc6T6pcaUZNukKhFk8eRErouDw16PQcrFoAyQasw4hGrOBjzu1CDD6BU0JfpCn/o4qb1bplIm1aU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=JBsoV9lC; 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="JBsoV9lC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D28FFC433F1; Fri, 5 Apr 2024 06:27:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712298441; bh=OXJLVbctLyBay+lIL1fIR4XWoNl2Q5H4SoCjZDoA5BU=; h=Subject:To:Cc:From:Date:From; b=JBsoV9lCJ+Xq7pR7WPICURlr3Ti3qa4l6STKYoPAf83kqzJeXegTREv1G87aUtYEQ JVDSAvoJH7DRe79oElFQSHRRTAyhz258v63HJ9Iy3+7D3MxVW3eG21q9mGrbtDeQfQ F87ioL/24350z49uWgQux9B0QN/OH9LEYxIXolNY= Subject: FAILED: patch "[PATCH] netfilter: nf_tables: release mutex after nft_gc_seq_end from" failed to apply to 6.1-stable tree To: pablo@netfilter.org,hexrabbit@devco.re Cc: From: Date: Fri, 05 Apr 2024 08:27:12 +0200 Message-ID: <2024040512-headset-cognitive-60e4@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 6.1-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-6.1.y git checkout FETCH_HEAD git cherry-pick -x 0d459e2ffb541841714839e8228b845458ed3b27 # git commit -s git send-email --to '' --in-reply-to '2024040512-headset-cognitive-60e4@gregkh' --subject-prefix 'PATCH 6.1.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;