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 93751279DB6; Tue, 12 Aug 2025 19:10:30 +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=1755025830; cv=none; b=E4dS8PY0fNgKGtm+7PbAg6j0zATE4enOIMxTt+SWE7KgzpJW4vuj/LEUO7t9TlhHSaorDQYGR2wLmDYFxMV2bMUp7tGg5iT6c8OxzYX1DjnJAywDPPTfEkGpVA4L59MEeZv5muf915VCfRXEYinx6bX5z9NbblUSUS0bJMYVVsY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755025830; c=relaxed/simple; bh=vM9bq7nJX8AAPL9Oio727bLG9QEyhnc9mx5wBFDyZAs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LYcFBI2qng5eT4VNRn6pjKmDmRNZjKe3nMmVORwXtVhGloqxMQy2pEt5ZLZIyhxCPy8mwZIEGDPl9KlkrEter8N4Wby1pJZtztadt4+gRzBlGzKyr+zYWygK/tuQp9iAMZm81wRpgKssIyRb5AoMeJvnpGUw0VneGEUzrw+XJgE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BUnsRXBL; 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="BUnsRXBL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01C9EC4CEF0; Tue, 12 Aug 2025 19:10:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755025830; bh=vM9bq7nJX8AAPL9Oio727bLG9QEyhnc9mx5wBFDyZAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BUnsRXBLD86OMgiL3rJHgLf7MPUDB1BHUo7cNYL8vBLcLQz16JiE1ETNqaczuj+ho CiYcTHpaxgt2MSeM0+lx9kTWda9074zRtw/8vQZp1rP8tcxTUc21wzVr4loEJMp50U axEkFgzd0yMt9nzpJtWMq2+oyMyaonTt8gypCzU4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alexey Khoroshilov , Fedor Pchelkin , Florian Westphal , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 6.15 149/480] netfilter: nf_tables: adjust lockdep assertions handling Date: Tue, 12 Aug 2025 19:45:57 +0200 Message-ID: <20250812174403.655448573@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812174357.281828096@linuxfoundation.org> References: <20250812174357.281828096@linuxfoundation.org> User-Agent: quilt/0.68 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 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Fedor Pchelkin [ Upstream commit 8df1b40de76979bb8e975201d07b71103d5de820 ] It's needed to check the return value of lockdep_commit_lock_is_held(), otherwise there's no point in this assertion as it doesn't print any debug information on itself. Found by Linux Verification Center (linuxtesting.org) with Svace static analysis tool. Fixes: b04df3da1b5c ("netfilter: nf_tables: do not defer rule destruction via call_rcu") Reported-by: Alexey Khoroshilov Signed-off-by: Fedor Pchelkin Acked-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nf_tables_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 3eb000ae2f27..843f2c3ce73c 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -3981,7 +3981,7 @@ void nf_tables_rule_destroy(const struct nft_ctx *ctx, struct nft_rule *rule) /* can only be used if rule is no longer visible to dumps */ static void nf_tables_rule_release(const struct nft_ctx *ctx, struct nft_rule *rule) { - lockdep_commit_lock_is_held(ctx->net); + WARN_ON_ONCE(!lockdep_commit_lock_is_held(ctx->net)); nft_rule_expr_deactivate(ctx, rule, NFT_TRANS_RELEASE); nf_tables_rule_destroy(ctx, rule); @@ -5770,7 +5770,7 @@ void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set, struct nft_set_binding *binding, enum nft_trans_phase phase) { - lockdep_commit_lock_is_held(ctx->net); + WARN_ON_ONCE(!lockdep_commit_lock_is_held(ctx->net)); switch (phase) { case NFT_TRANS_PREPARE_ERROR: -- 2.39.5