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 9366D7F7C6; Mon, 8 Apr 2024 13:18:22 +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=1712582302; cv=none; b=fkNXBFpI3PbpNXfFMzKaq6XolhslerC0tf4y1NasXIilrq6/iSzcXpgkCHIp1h/nvIdwdzrCgV5GJCR92EKtCjbJpKSIvoFA3lp7Vh4PlSpcczRm/+7l+KZV0URBB+8h4Tiy5oikoYfn9sNzG7FX1no2pnoRZr346xQBrWAnoCg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712582302; c=relaxed/simple; bh=89mvpY1HKVY/RjHmw0ysPMDD7DCzjqH6uIaK8nZTY+A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EV2hQsmTPngRfhqGMC3YPmcfQvhAs87F6zrJsGHulUFdmLAg/DXlJZ06cfBy8ujglGNqAcNfNgKwqsjjXoKOef2AXFp5ve+qefyAHv6tdoQ4/BX0bZMCGjNPI41sh/9CXrKPFnaUXhw62XZubKoneGDwzgtP4Oy1goHaLSjZCFs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=isjtGDHq; 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="isjtGDHq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CED0CC433F1; Mon, 8 Apr 2024 13:18:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712582302; bh=89mvpY1HKVY/RjHmw0ysPMDD7DCzjqH6uIaK8nZTY+A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=isjtGDHqQL3e/ISnOuO9if1miFsnVG3cvmMsk3m66ZohC0Owd/cEXUikjpNaBKT97 vDZ1ghSRd+UtNm+eOND3JGYAnQJ5hm2LlaVF7ARCFTXntxfY+tYxp6kU82kKcJjLbb FlkG/0UkODTKME+j9P7wcyUdZBn5ISpSrJ0huqhQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pablo Neira Ayuso Subject: [PATCH 6.6 082/252] netfilter: nf_tables: release batch on table validation from abort path Date: Mon, 8 Apr 2024 14:56:21 +0200 Message-ID: <20240408125309.183689463@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408125306.643546457@linuxfoundation.org> References: <20240408125306.643546457@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pablo Neira Ayuso commit a45e6889575c2067d3c0212b6bc1022891e65b91 upstream. Unlike early commit path stage which triggers a call to abort, an explicit release of the batch is required on abort, otherwise mutex is released and commit_list remains in place. Add WARN_ON_ONCE to ensure commit_list is empty from the abort path before releasing the mutex. After this patch, commit_list is always assumed to be empty before grabbing the mutex, therefore 03c1f1ef1584 ("netfilter: Cleanup nft_net->module_list from nf_tables_exit_net()") only needs to release the pending modules for registration. Cc: stable@vger.kernel.org Fixes: c0391b6ab810 ("netfilter: nf_tables: missing validation from the abort path") Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- net/netfilter/nf_tables_api.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -10326,10 +10326,11 @@ static int __nf_tables_abort(struct net struct nft_trans *trans, *next; LIST_HEAD(set_update_list); struct nft_trans_elem *te; + int err = 0; if (action == NFNL_ABORT_VALIDATE && nf_tables_validate(net) < 0) - return -EAGAIN; + err = -EAGAIN; list_for_each_entry_safe_reverse(trans, next, &nft_net->commit_list, list) { @@ -10522,7 +10523,7 @@ static int __nf_tables_abort(struct net else nf_tables_module_autoload_cleanup(net); - return 0; + return err; } static int nf_tables_abort(struct net *net, struct sk_buff *skb, @@ -10535,6 +10536,9 @@ static int nf_tables_abort(struct net *n gc_seq = nft_gc_seq_begin(nft_net); ret = __nf_tables_abort(net, action); nft_gc_seq_end(nft_net, gc_seq); + + WARN_ON_ONCE(!list_empty(&nft_net->commit_list)); + mutex_unlock(&nft_net->commit_mutex); return ret; @@ -11335,9 +11339,10 @@ static void __net_exit nf_tables_exit_ne gc_seq = nft_gc_seq_begin(nft_net); - if (!list_empty(&nft_net->commit_list) || - !list_empty(&nft_net->module_list)) - __nf_tables_abort(net, NFNL_ABORT_NONE); + WARN_ON_ONCE(!list_empty(&nft_net->commit_list)); + + if (!list_empty(&nft_net->module_list)) + nf_tables_module_autoload_cleanup(net); __nft_release_tables(net);