From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794273324; b=i5f3hjAqd5vEs8pWfAv9coJQRJj0SyEpMurMyfcIca3EsVj7lOVnFqvIaYG/9sVzNr/u 9lJTEewyejN/6k38q6FedGkhHN16WJPeAw6NYGmGXGcv8lLsnTD2VjREToTHALywYXg+Q C1KB9BGZ2OIGVsBWLUlhEwCzdce6XZjYvD2l0olDGN+Y1tENsx68jKv0vcVSltBmvbkOI nT0wInA8tzbmSeUXWSRpCwUwQzHNPnGoFmjbM6dpXzAj8gvmF+81BTZnwAsLyZ/SXpG7m AYCoDh7REQtMcYQVN0oOazqMWQSvjrS4+UItiSxUWklJKb+eHoZhg3HKVZyH7TAR4RA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794273324; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=rAa+ZPvKLVWBYnFmwd5O/8WgLlcf6lE6hIaQJJhfDuc=; b=b5YOuUbmruv6FBqsN45f/ceh6dUHYUTOidvAJF4k+cbhWVd4UrZmQ/OnpDT/tLI4TAU9 aX+x2M1tH0bzU1UXZCZIvRvTqaRUlOMqUK3vQPHdn7ZyCxXU0lSVk/3Dw2xSXO0Q9s4tf HBngmPtNVeYUM7kvNLkI0SAoUABphXYDIdAjy7tAoCf2KQPviUkmvNc2VEHOupbAFanSQ W/7xJE/CycjRLIeBIgymUvZnhebrjU1Gf/y1XMLQbGfUsY+5avAElF8kfWgJkdKZQgvP4 nqJdCnF1ldEq1pr335J2GlgOiX4xmyZSE/l4RkxrS5r4b4Y9mHQSEwWEWdKQeeeFqTA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=JcLft6gd; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BDC1C606A31C for ; Tue, 10 Nov 2026 01:15:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=JcLft6gd Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4851F1F0089F; Tue, 10 Nov 2026 01:15:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794273323; bh=rAa+ZPvKLVWBYnFmwd5O/8WgLlcf6lE6hIaQJJhfDuc=; h=From:To:Cc:Subject:Date; b=JcLft6gdRQ4QlcQ9Gg1LQ6zo4kmtWp37ianrZk+8+yJFRaSpRDOO/5pacGgk03XpK H/K0UJtqpDm53GSK+6UltAtpGVgZ5GOTl4OHKzXVOViY0wJl8/t1cNma/FBH+QsRFB arNIbg5K9X5L0mTfvz7mO+37qZu46kqfvLyxuNTuGtpbCWa7LUiMELrASnTMr441Ma o6IIi7RMZGlCWPRnSF1mSYiu1sl0jq2kp6TsrCYnTOPeXPMtDtEfl0+J7MM1JalPuI JAblPfh38MpSy/0OBOKSM+ZKqMDVXda8hw+mgDUlkaOMx8cJr51zEWrJNqp1XEFYmO PZMGXyvVWfVIA== From: Sasha Levin To: sven@narfation.org Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] batman-adv: tt: ignore ROAM flag of received ADD changes" failed to apply to 6.1-stable tree Date: Mon, 9 Nov 2026 20:15:22 -0500 Message-ID: <20261109201522-failed-6.1-c5d68abe6e7f@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x c5d68abe6e7f1dbd132a602cb696fe1fff0389eb # git commit -s git send-email --to '' --in-reply-to '20261109201522-failed-6.1-c5d68abe6e7f@kernel.org' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From c5d68abe6e7f1dbd132a602cb696fe1fff0389eb Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Wed, 7 Oct 2026 13:03:29 +0200 Subject: [PATCH] batman-adv: tt: ignore ROAM flag of received ADD changes A received TT change (OGM diff or full table response) with the ROAM flag but without DEL is handled by batadv_tt_global_add() like a ROAMING_ADV: * a newly created global entry gets BATADV_TT_CLIENT_ROAM and is therefore excluded from the global CRC. The sender has it in its local CRC and the receiver has to request the full table again * batadv_tt_global_purge_local() removes the local entry of the receiver. The receiver's own client is considered as roamed to the sender and frames for it are rerouted The ROAM flag only has a meaning together with DEL. Drop it on reception to keep it from populating the global table with a temporary ROAMING entry which is not part of the CRC - and therefore causing a CRC mismatch. Cc: stable@vger.kernel.org Fixes: 068ee6e204e1 ("batman-adv: roaming handling mechanism redesign") Signed-off-by: Sven Eckelmann --- net/batman-adv/translation-table.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 0df51523dcf0c..247cce95c09f4 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -3941,21 +3941,30 @@ static void _batadv_tt_update_changes(struct batadv_priv *bat_priv, u16 tt_num_changes, u8 ttvn) { int roams; + u8 flags; int i; for (i = 0; i < tt_num_changes; i++) { - if ((tt_change + i)->flags & BATADV_TT_CLIENT_DEL) { - roams = (tt_change + i)->flags & BATADV_TT_CLIENT_ROAM; + flags = (tt_change + i)->flags; + + if (flags & BATADV_TT_CLIENT_DEL) { + roams = flags & BATADV_TT_CLIENT_ROAM; batadv_tt_global_del(bat_priv, orig_node, (tt_change + i)->addr, ntohs((tt_change + i)->vid), "tt removed by changes", roams); } else { + /* an announced client cannot have roamed away from + * orig_node. Only a ROAMING_ADV is allowed to add a + * global entry with the ROAM flag + */ + flags &= ~BATADV_TT_CLIENT_ROAM; + if (!batadv_tt_global_add(bat_priv, orig_node, (tt_change + i)->addr, ntohs((tt_change + i)->vid), - (tt_change + i)->flags, ttvn)) + flags, ttvn)) /* In case of problem while storing a * global_entry, we stop the updating * procedure without committing the -- 2.53.0