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 7766D3F9D2; Tue, 12 Aug 2025 18:10:52 +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=1755022252; cv=none; b=dpOa9iiQgGruytFCDVkwdheQyDL2mfkXmN7V2Rl1x8KJ5ZxzhYJzs6MdjngVwjyvAfQrbbys+zFi//hxtsqSTsr21xMLSZjQsGbs187B5QaXDf0a4j+/SVibwCRflkZhLw90quI0CI0Y5wBItQSJuZjzzNIx9/vqUx1/q1V2WG4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755022252; c=relaxed/simple; bh=aZz6ZummEWUk9HMsMFgSu1oJjH77wMeo9g8dr6RPjYw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GvUGNGOM0G7Ie5MZBx9fnKQR4kTB3/R5TUYyZxJq3BbK2XW+r55OmWJLEU3wzb0gZEk0ub1jpl0t3vnbmECJxv5GYVAnSIMyUs3CrRTf0WF7XZYeTrbxbhGl7YLrwhHvqJPdKwnGXhjMPLRD51diA45IA4tVzqxdawdAehWgeow= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2IqDcJ7x; 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="2IqDcJ7x" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1FA1C4CEF0; Tue, 12 Aug 2025 18:10:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755022252; bh=aZz6ZummEWUk9HMsMFgSu1oJjH77wMeo9g8dr6RPjYw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2IqDcJ7xE8snVoWsuXVihgyynMmYuhMMEbjUMVURKbu+36reWVwe2bnOvBhjqTIPS 80OqZuTWoQxag4zwQaQ0SktwAp7S84ZEINN43AUQYkgVblT692GZf3F0z/KfanuqbS zIcssId7JEP5GC5EJUlhebYYttGeJUGqtoS1/aZY= 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.12 099/369] netfilter: nf_tables: adjust lockdep assertions handling Date: Tue, 12 Aug 2025 19:26:36 +0200 Message-ID: <20250812173018.502992180@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812173014.736537091@linuxfoundation.org> References: <20250812173014.736537091@linuxfoundation.org> User-Agent: quilt/0.68 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.12-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 8077bf0378bb..3743e4249dc8 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -3874,7 +3874,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); @@ -5659,7 +5659,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