Received: from dvalin.narfation.org (dvalin.narfation.org [213.160.73.56]) (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 3F6DB3F8EA7 for ; Fri, 26 Jun 2026 16:11:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.160.73.56 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782490297; cv=none; b=M2oT8HzA71MhR2CtT8nsCQnkxSHa/PrWtrgK1w4FzF/zRacGLoU58v7Jf/1Z0EIj7Cu4QLzxBoLKkLIWBf3ot79NNt4GrNNu3oW8NVxLyox//woobWWERHukVTM+gw+Q5yugWAd3/NSQ/1BZjonaWXzanXwaoRC6h2cwThVcc30= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782490297; c=relaxed/simple; bh=iaaDlS7K+DaryFn1audO96N1WdbHp/l6MSqUw89AUKE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OLLx5Ccn/SBWXPApUoHDrnC4sxAbcc8hV1KDiCNCD+6NuYC1W2h8WpXpNiu4jKBjU7y367L+z29hE/y8qx0dosApGcNiCvq/t1L2P/6FKnpSp3VstNpGMWPQfYj15FzvxeJCWn8DPK5+JGm3CPNXTBqyh42OcpfbeeJyevqm3G4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=narfation.org; spf=pass smtp.mailfrom=narfation.org; dkim=pass (1024-bit key) header.d=narfation.org header.i=@narfation.org header.b=NMkNeHQd; arc=none smtp.client-ip=213.160.73.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=narfation.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=narfation.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=narfation.org header.i=@narfation.org header.b="NMkNeHQd" Received: by dvalin.narfation.org (Postfix) id C2FAE203D3; Fri, 26 Jun 2026 16:11:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=narfation.org; s=20121; t=1782490294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iPBQjCD7dGe+iFjJoNHwU2XTWvkBiwbZ35RLP782/fE=; b=NMkNeHQdoS+jip2Y20+7Vl0KToCrzvcD92+8EsGfvhYuxTrjChlPw9JBVsT55z9S3MRwDl udKOuLPD5V4keOG2XqhFD6RY7DGG9/KJBbreHKMJBPfN78tj3Oj6D5caKyN46HoTdQjpg1 4BoRS4vu34yp9gkBPJGq3itI/eOl9fQ= From: Sven Eckelmann To: stable@vger.kernel.org Cc: Sven Eckelmann Subject: [PATCH 6.1 23/25] batman-adv: dat: prevent false sharing between VLANs Date: Fri, 26 Jun 2026 18:11:21 +0200 Message-ID: <20260626161123.124273-24-sven@narfation.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260626161123.124273-1-sven@narfation.org> References: <20260626161123.124273-1-sven@narfation.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit commit 20d7658b74169f86d4ac01b9185b3eadddf71f28 upstream. The local hash of DAT entries is supposed to be VLAN (VID) aware. But the adding to the hash and the search in the hash were not checking the VID information of the hash entries. The entries would therefore only be correctly separated when batadv_hash_dat() didn't select the same buckets for different VIDs. Cc: stable@kernel.org Fixes: be1db4f6615b ("batman-adv: make the Distributed ARP Table vlan aware") Signed-off-by: Sven Eckelmann --- net/batman-adv/distributed-arp-table.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index e8d706d86aa82..36462d9288c7e 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -215,10 +215,13 @@ static void batadv_dat_purge(struct work_struct *work) */ static bool batadv_compare_dat(const struct hlist_node *node, const void *data2) { - const void *data1 = container_of(node, struct batadv_dat_entry, - hash_entry); + const struct batadv_dat_entry *entry1; + const struct batadv_dat_entry *entry2; - return memcmp(data1, data2, sizeof(__be32)) == 0; + entry1 = container_of(node, struct batadv_dat_entry, hash_entry); + entry2 = data2; + + return entry1->ip == entry2->ip && entry1->vid == entry2->vid; } /** @@ -345,6 +348,9 @@ batadv_dat_entry_hash_find(struct batadv_priv *bat_priv, __be32 ip, if (dat_entry->ip != ip) continue; + if (dat_entry->vid != vid) + continue; + if (!kref_get_unless_zero(&dat_entry->refcount)) continue; -- 2.47.3