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 591F01C695; Thu, 2 Jul 2026 16:53:43 +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=1783011224; cv=none; b=EGqxhAbMoOZxOw+CGB5MUbKC5ddLkBNShmn9R/CedHQ5Q/8qBk+rsi772xZsezlJSvUny5INSq5Vi5nxr0XEWc54ZPqvQ4ymaoJ9DOwLDumkDBjkg8UX5eYjbUmDH1R/4HO0CVM9kdN87F1nhuLSZhjV0KEjxxwkf/MHsChrRKw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783011224; c=relaxed/simple; bh=1PS09KeoqrIhp6Bbp/unOnNh0Z9hJk31hwTFcP8zXE0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jLnTT0sCv6cx4hDzzVYl/cbi0SCmG14pQljUGsaKlWrRov9uor/GtWJEu1TX3G62wZcb5wtYt+LeYGiBTv8yBwo2t4In6VyFVvnZDXZCtRamBmO2GzmFFELa3MvGGEkWFa4J3BEdmb0RebS3EdTqrQ3ku6TAVK4lQs+Dt24n9gk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CF1ww1Z6; 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="CF1ww1Z6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BFE181F000E9; Thu, 2 Jul 2026 16:53:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1783011223; bh=SyByX+BNkSUxfLuOSmWfTwHYbzRqfrQEj9nAlISzYIU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CF1ww1Z6987TD98oO/gJZiPAIt+zxc/5hhrPuZYF+Wfkvir3tN0UtfhOgUqYayjvR rYC8BTjViBOxI/CtyFRZssMYW6P3Cqu6P1N6AGY0MxiYxF3mVanl3tZ7Nwew4MuYI1 NT1VwkEAuY699U0rrBE+WwRL/flSFfpOgGJQ3mcI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable@kernel.org, Sven Eckelmann , Sasha Levin Subject: [PATCH 6.18 027/108] batman-adv: tt: dont merge change entries with different VIDs Date: Thu, 2 Jul 2026 18:20:24 +0200 Message-ID: <20260702155112.672870697@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260702155112.110058792@linuxfoundation.org> References: <20260702155112.110058792@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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sven Eckelmann commit f08e06c2d5c3e2434e7c773f2213f4a7dce6bc1e upstream. batadv_tt_local_event() merges/cancels events for the same client which would conflict or be duplicates. The matching of the queued events only compares the MAC address - the VLAN ID stored in each event is ignored. If a MAC would now appear on multiple VID, the two ADD change events (for VID 1 and VID 2) would be merged to a single vid event. The remote can therefore not calculate the correct TT table and desync. A full translation table exchange is required to recover from this state. A check of VID is therefore necessary to avoid such wrong merges/cancels. Cc: stable@kernel.org Fixes: c018ad3de61a ("batman-adv: add the VLAN ID attribute to the TT entry") Signed-off-by: Sven Eckelmann Signed-off-by: Sasha Levin --- net/batman-adv/translation-table.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 9f6e67771ffa80..acd8af4446671f 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -446,6 +446,9 @@ static void batadv_tt_local_event(struct batadv_priv *bat_priv, if (!batadv_compare_eth(entry->change.addr, common->addr)) continue; + if (entry->change.vid != tt_change_node->change.vid) + continue; + del_op_entry = entry->change.flags & BATADV_TT_CLIENT_DEL; if (del_op_requested != del_op_entry) { /* DEL+ADD in the same orig interval have no effect and -- 2.53.0