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 9DECE25B09B; Thu, 2 Jul 2026 16:53:48 +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=1783011229; cv=none; b=B+x7s1aLtcGCTuUv3R13rzK+cLIFai35OH3GRhxYEhvBkl3R5SvYvlaah/sUCERMlXeMyk5xDEXNc1Nk45eZ+KwFfTiaC4tTI7RfdHbsEPZOxwV1Ssm0xNs/rj/FCZsQcOBCoTVEbLpDRT75UVYMsZ2acmwQVk6gmwFafmWQ0fU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783011229; c=relaxed/simple; bh=291LOdU+kg+oLzlxFCH802KEYlnV3BE63WOA3EID5so=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jOBI/wbCW4Pst65PcTXL+gc41ZgleflZkb6ry9Q66Mg1hDkkoMUZ2HDMUII3TmzJlvTVPVf/uVStkN7mFRVUnitLITv9G6leRQo7uyr4cUSSS+AUYJ0V5VKwrcyJy7WL1IivtyhdW45q2RYiKBd+5l9nxtMcm6SZlmwIyZngq7s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FhZJVYab; 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="FhZJVYab" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0EC481F000E9; Thu, 2 Jul 2026 16:53:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1783011228; bh=J/Ow45jKfeyv4Be7OfFI3F2AZGX5AHiwu8gQthnu7eA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FhZJVYabYgUPEwox3dZw2RNCBNGKnmSgFqd3TOHhDfrbN1ljnTfOyrX72qg0B3aJB vYrLx0eCmNljTsaCuTLOW7is67NgPLJgb1W1FpkDrviCZc02YZSwqeJfEWULT1Ppgm XduB6whzCFu+EITLWgPTnIL1PZOCOwbKDSlfit3c= 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 029/108] batman-adv: dat: prevent false sharing between VLANs Date: Thu, 2 Jul 2026 18:20:26 +0200 Message-ID: <20260702155112.714962437@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 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 Signed-off-by: Sasha Levin --- 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 031c295fff1b1d..860db505e8697f 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -214,10 +214,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; } /** @@ -344,6 +347,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.53.0