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 9546630E829; Sat, 30 May 2026 17:20:28 +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=1780161629; cv=none; b=Gri09nfyycJjPZfASI3wopNGvQzLqvykAiRhOSX+7qX1+qd2symT5GDQW3T1+jwYl0ii32np4hDZMqhL/+iitOxtCtM7y/EKQBxakKqR813f/+tFHLeZDwBAifD+P97SP4hm2lz/FXqqYgFliD5MYMH4fGZkd8G1d75FBq23j6o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780161629; c=relaxed/simple; bh=jLGtoJdV7Z96Ns9OkNotuQZ/0XTq8smahkxpGLPGP2M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=t6XalnQXIIMM++mie/+ujWdneFvxr0wsGWWTu/hDDaku0MJVuD+ElUtYdFzVyQlIRbb8SoH2cS69foQTQkweUQ/pAQmA/2QFZiszCmwMoQieXUVaeaYRId8XfgVAIV7jamMVk6VndpH/rkYK2dFMfGIsrlUeyp7TMiyCPA+SKPc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=g1kWWRd5; 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="g1kWWRd5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8DE891F00893; Sat, 30 May 2026 17:20:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780161628; bh=oTaNOy8mCqpNDBa+kCP/2WUz/jSCKVE3mqwOJfv+uMQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=g1kWWRd5KKeVFFIk3IxLhlrPQCdtXXrbjF+17mZX1EW5QzJe3bw2rd0OYe4KTsjRl NcAK++J0viPBslTProV5fLsxTfJ84rC8AeNwGEOfmJrPSJbQmocud4ZwE4MI7cqpO7 tmjMjX/XG7oraiuh9w45Q/6xqCnwDNQhYhru+8SY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dudu Lu , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Paolo Abeni , Sasha Levin Subject: [PATCH 6.1 680/969] net/sched: sch_cake: fix NAT destination port not being updated in cake_update_flowkeys Date: Sat, 30 May 2026 18:03:24 +0200 Message-ID: <20260530160319.279729159@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dudu Lu [ Upstream commit f9e40664706927d7ae22a448a3383e23c38a4c0b ] cake_update_flowkeys() is supposed to update the flow dissector keys with the NAT-translated addresses and ports from conntrack, so that CAKE's per-flow fairness correctly identifies post-NAT flows as belonging to the same connection. For the source port, this works correctly: keys->ports.src = port; But for the destination port, the assignment is reversed: port = keys->ports.dst; This means the NAT destination port is never updated in the flow keys. As a result, when multiple connections are NATed to the same destination, CAKE treats them as separate flows because the original (pre-NAT) destination ports differ. This breaks CAKE's NAT-aware flow isolation when using the "nat" mode. The bug was introduced in commit b0c19ed6088a ("sch_cake: Take advantage of skb->hash where appropriate") which refactored the original direct assignment into a compare-and-conditionally-update pattern, but wrote the destination port update backwards. Fix by reversing the assignment direction to match the source port pattern. Fixes: b0c19ed6088a ("sch_cake: Take advantage of skb->hash where appropriate") Signed-off-by: Dudu Lu Acked-by: Toke Høiland-Jørgensen Link: https://patch.msgid.link/20260413110041.44704-1-phx0fer@gmail.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/sched/sch_cake.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c index e4fd66a1c5cd4..204cc04d4c6e8 100644 --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c @@ -619,7 +619,7 @@ static bool cake_update_flowkeys(struct flow_keys *keys, } port = rev ? tuple.src.u.all : tuple.dst.u.all; if (port != keys->ports.dst) { - port = keys->ports.dst; + keys->ports.dst = port; upd = true; } } -- 2.53.0