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 01975366816; Tue, 21 Jul 2026 20:53:09 +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=1784667190; cv=none; b=GJsit1jJl29iUC+qeRmWWXVTsnL2DbwZHxYRNgQ/1dYa+uAmsj447WGO2SNEhC4NuXDrNaEU3ZO3vkWncNVhaf+uo+V54xb6tGMxzKs0rwmnsfDkatFaQVtVOQDeIjm01qbE0CRbuXe2TJZIwtZO88Plflo/DJq9ijWOM2AlUQo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784667190; c=relaxed/simple; bh=Plcn/xy/H7ZH6Dsr2NspFIRv/djmeSeizgjMoHN7nZ8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GbC8evO3BmK/U9Kj6oulI/Fn8Os5Nzr+XvM+VC5/Ts64KW5z7heqJjWvtCreZEedKyDm/AmRprq95PC6QxrfaAlimABc4XvfnX0MWT28ZyVBHbc4h2GKC7SDBRIdic21Miw/SiVE8SF0CEGW79S0TcB/n385sk76GuHQlzNXbx8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FiI5KSc5; 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="FiI5KSc5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 675021F000E9; Tue, 21 Jul 2026 20:53:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784667188; bh=HN6QMO+cmA4vUZTjEj7PlNxoRKNx9q2JT0r5kAM9GEg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FiI5KSc5NiIuo6/A6OiIospvMHv7Dz0xB5Logt9Z+p1pVWxjtYrY/BFA5p4hBcwXu aO09fWS5D2cG1LuM1J792innHFejjkgxJqrWwqqyL/ZRHmvlKye3YewS4fjk584JuT pk8la7NC7MutJ70my5TGx9gYmfgB1l5iQhpbahqA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Carlier , Florian Westphal Subject: [PATCH 6.6 0924/1266] netfilter: nfnl_cthelper: apply per-class values when updating policies Date: Tue, 21 Jul 2026 17:22:41 +0200 Message-ID: <20260721152502.513774107@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152441.786066624@linuxfoundation.org> References: <20260721152441.786066624@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 6.6-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 @@ -348,8 +348,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: