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 D0F092DE1E2; Tue, 12 Aug 2025 17:52:45 +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=1755021165; cv=none; b=s6rFWsxfXkHG1tXao1Wu+Q4mi5HhfxmeyKSmzHQr4rBj48BXTmH09Df047cEmSuwUCqUzdFtAEZCaSQrN1MQKi5HSv/pqQFHMmTwK5g9rxnNV8+ZsA8QD75cSdOb9t+6gLbbSIT+RvS0fGbKjWwWXmITir4qvwLJdd8IBVWXXOk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021165; c=relaxed/simple; bh=2sj3xJ+3uTvZ9DnCzRWIN1YB7vHKs858EnuxJcSAOTI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f1YuxLrmdm9L0vqwARB6oZdjNbMfV+ZuyuKJwGZefS4ODMKEqeX0WxoA8ZxJn8ZQ/fb8JBbNPwKr+0vk759A9zT2esH999wA9DtKpoydDmHdTqZbnlztNXUJoTM9PYqdNrQaPXY4J0J47A08vTpqHHg6sGHeL/obfS4JpHDO5IU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=D2zYL/lf; 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="D2zYL/lf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2029EC4CEF1; Tue, 12 Aug 2025 17:52:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755021165; bh=2sj3xJ+3uTvZ9DnCzRWIN1YB7vHKs858EnuxJcSAOTI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D2zYL/lfxi9/GVpO14zXTRpTAMMEiSLoMl+8HhXIvwnspr6qoO17l5k/UA18VE+xf XM73M1/i7Hlzm579+aRiz0vDevwPTPZMAeS+HjbpPrgAvvrqmlPiD8BMqFMXnH8z9U VVgzaYXs6R14+4vxsHUBoxGHq3Kfm5C07GAtdQbU= 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.6 072/262] netfilter: nf_tables: adjust lockdep assertions handling Date: Tue, 12 Aug 2025 19:27:40 +0200 Message-ID: <20250812172956.088464028@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812172952.959106058@linuxfoundation.org> References: <20250812172952.959106058@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.6-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 c9582f008983..4ffb5ef79ca1 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -3775,7 +3775,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); @@ -5571,7 +5571,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