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 926501465A5; Thu, 11 Apr 2024 10:23:57 +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=1712831037; cv=none; b=eduzuV/FsEzFAMh+doobOfWocT/krEa0NftBVWOb33HC6yClf7oFESEzxaINbeXNGEBci6UeR8qGnyxLhBmnxGxddQawbfkgItJa89PWv9d9HPbiIcm3AoypNrtXgMfP7cqPplEzho29NVVArnf9Em6YLPgubcrISnvlNgJBwgQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712831037; c=relaxed/simple; bh=TNF6JSzeakaI9wQ5oBT8mY9QDjxnS+kl5vKBYlcbc6E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jpM2CMGoC61oN4B/6tyTpPT8Lv4UX4eQIIpewOTMSVPz88SUjqC5aApBlZRZVdQdoGfWExpwn5HLeIcSuRy0eDi0iHnCeCev4vkGBHZSn+3pTMCL+jiBWUdiDE64COe8ky/XaQLa9uPMfqtpyfo4nRPnosIM+db5tA4iflLX1h8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=M4lueybD; 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="M4lueybD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B628DC433C7; Thu, 11 Apr 2024 10:23:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712831037; bh=TNF6JSzeakaI9wQ5oBT8mY9QDjxnS+kl5vKBYlcbc6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M4lueybDjCHvaUckNpYOjpmst5ws2lQcxjl6tJ9VKzss5+BTh/6qfz7QklqdoahO9 YLYEVlTFe3hnsRo4i5uhrz2aEGTsIlogLL9g4elCBlz8rT77xtuITFQQXJtlRmvtgP wObHDVWlBSDK4BnAg6jc6MECUJXSqHX0Nn3WkEbk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kuan-Ting Chen , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 5.4 203/215] netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path Date: Thu, 11 Apr 2024 11:56:52 +0200 Message-ID: <20240411095430.958428222@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240411095424.875421572@linuxfoundation.org> References: <20240411095424.875421572@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pablo Neira Ayuso commit 0d459e2ffb541841714839e8228b845458ed3b27 upstream. 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 Signed-off-by: Sasha Levin --- net/netfilter/nf_tables_api.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index b719f3517caf1..8dd7efb3b8f7b 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -7696,11 +7696,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; } @@ -7717,6 +7712,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; -- 2.43.0