From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 8BBA735C6AB; Tue, 21 Jul 2026 22:49:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784674190; cv=none; b=GNBXHSRC98aQ7Ka7NmP9KNhNd3hATyJDRBod+K1i+7wlcxW8z/+zoKt0L7SFUXDl5vchTgBtYwJTDrPg2YBD3zDCpJ7qxH69rLYWwOtkk3jW1KSMYV3aHss86k/7QbJRuAhlD+mi5gjicIEc1nVLs+ihl36naduXnaNniAtxsCI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784674190; c=relaxed/simple; bh=NiQNAOZuwbwS+vLWSYV58Z42eSy2ws/cJqAmJWdE9kM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PN10moqAzDpZ9jSRh7K8Ui5M0i00qj284nGrgdRB2n4FXHpsoKLWQ80Pn3HmLC/zFh7kMsaXKycgGoDQ/PN0PdjiZdbASZBtMaXVQguzn7LIl/jcoFGLJB45/SgOXRw64XGESMx0N3/Uswht9ejIJ4HjFIfwQij9EOo2V5yqDRU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=U/hU0gz3; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="U/hU0gz3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8A311F000E9; Tue, 21 Jul 2026 22:49:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784674189; bh=mFP6PmS3VW3U2hKagBT4Osehs5fHKQ3yS9aSkIVr4S0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=U/hU0gz3PCiVE2ADojDRUSZkDsoLyT2J/E0xSc+nGzQNF9HqYr04FYEg/B1pJTDRX 6XpCeXRmLgi3wjUCrAjmS0LAUIPiYyqglFUxG+DzoXPCH9Gqyp1E2c35QYAGI0HrKO N/h0CSQow1ujE3OJBeMAM7CVPW6hw4JVTrmpWatI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Carlier , Florian Westphal Subject: [PATCH 5.10 445/699] netfilter: nfnl_cthelper: apply per-class values when updating policies Date: Tue, 21 Jul 2026 17:23:24 +0200 Message-ID: <20260721152405.739056309@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152355.667394603@linuxfoundation.org> References: <20260721152355.667394603@linuxfoundation.org> User-Agent: quilt/0.69 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 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Carlier commit d738feccb98cb224ebabecb703e98f5008276bff upstream. When a userspace conntrack helper with multiple expectation classes is updated via nfnetlink, every class ends up with the first class's max_expected and timeout values. nfnl_cthelper_update_policy_all() validates each new policy into the corresponding slot of the temporary new_policy array, but the second loop that commits the values into the live helper dereferences new_policy as a pointer instead of indexing it, so every iteration reads new_policy[0] regardless of i. An update that changes per-class values is silently collapsed onto class 0's values with no error returned to userspace. Index the temporary array by i in the commit loop so each class gets its own validated values. Fixes: 2c422257550f ("netfilter: nfnl_cthelper: fix runtime expectation policy updates") Cc: stable@vger.kernel.org Signed-off-by: David Carlier Signed-off-by: Florian Westphal Signed-off-by: Greg Kroah-Hartman --- net/netfilter/nfnetlink_cthelper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/net/netfilter/nfnetlink_cthelper.c +++ b/net/netfilter/nfnetlink_cthelper.c @@ -344,8 +344,8 @@ static int nfnl_cthelper_update_policy_a for (i = 0; i < helper->expect_class_max + 1; i++) { policy = (struct nf_conntrack_expect_policy *) &helper->expect_policy[i]; - policy->max_expected = new_policy->max_expected; - policy->timeout = new_policy->timeout; + policy->max_expected = new_policy[i].max_expected; + policy->timeout = new_policy[i].timeout; } err: