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 E078B46AF1E; Tue, 16 Jun 2026 17:40:12 +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=1781631613; cv=none; b=WSNjQX0plMVrgjINfdL3uzkh7UCcIp+Qa2V3c+nPQenv0GcDpwpmNZm85PA5hxB3/VmfnrJHixqzw6R67DW23LQtZITn/knI2ruBybfMAiA7So9o3g2tYf+9tJ6vnpVJ43c5oQ9FZpJgbYWR98xbp/sJWLfQYcp1EK+jCp7YUjE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781631613; c=relaxed/simple; bh=44D5rCpwou7DvtjJvgKasFuto6MguzY6FrCxo/ijG/o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eFKd78kcaiL7yTR0MxQD3oqrCz7zhf3umShqCEIuoIMUha5ydmeEdzDiTN2pmu/qsTvG4Dt5uK/g6zIjUNNqHqvRdSRPYBlmQRpSfqOIkomfLgOQQhDCw1eDOR2odQMZ9k2QWMK3FxrTajrubBwjYssidHv+1W46CE7l6oLqW4g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wSyaThiy; 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="wSyaThiy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C588A1F000E9; Tue, 16 Jun 2026 17:40:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781631612; bh=27FkKA7wSvXGcLjG0xtzd1O6W2B67MWoUPFZe/JyzAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wSyaThiylhNuNi2Zyv+AOJmjI8duw22en1BZAcjWSublT+r/bfawdKxhOwsA0Apgg 0LRkWlDqx7wPhhNmjpMTP3qoJXXQVhwmBBhbfHROOkOgGpeGaqpsEKH7R+dADULxVv yd0dft32FHkHpQBxTZGibDpPrOd17cI3AiHuB4fk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Dumazet , Steffen Klassert , Nicolas Dichtel , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1 254/522] ip6_vti: fix incorrect tunnel matching in vti6_tnl_lookup() Date: Tue, 16 Jun 2026 20:26:41 +0530 Message-ID: <20260616145137.842720147@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145125.307082728@linuxfoundation.org> References: <20260616145125.307082728@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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet [ Upstream commit a5c0359f5cbc51a2e2b114d6041e0f3c73f903e9 ] In vti6_tnl_lookup(), when an exact match for a tunnel fails, the code falls back to searching for wildcard tunnels: - Tunnels matching the packet's local address, with any remote address wildcard remote). - Tunnels matching the packet's remote address, with any local address (wildcard local). However, vti6 stores all these different types of tunnels in the same hash table (ip6n->tnls_r_l) prone to hash collisions. The bug is that the fallback search loops in vti6_tnl_lookup() were missing checks to ensure that the candidate tunnel actually has a wildcard address. Fixes: fbe68ee87522 ("vti6: Add a lookup method for tunnels with wildcard endpoints.") Signed-off-by: Eric Dumazet Cc: Steffen Klassert Reviewed-by: Nicolas Dichtel Link: https://patch.msgid.link/20260608164613.933023-1-edumazet@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/ipv6/ip6_vti.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index ead8f1ecd8271b..8808067df5168c 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -105,6 +105,7 @@ vti6_tnl_lookup(struct net *net, const struct in6_addr *remote, hash = HASH(&any, local); for_each_vti6_tunnel_rcu(ip6n->tnls_r_l[hash]) { if (ipv6_addr_equal(local, &t->parms.laddr) && + ipv6_addr_any(&t->parms.raddr) && (t->dev->flags & IFF_UP)) return t; } @@ -112,6 +113,7 @@ vti6_tnl_lookup(struct net *net, const struct in6_addr *remote, hash = HASH(remote, &any); for_each_vti6_tunnel_rcu(ip6n->tnls_r_l[hash]) { if (ipv6_addr_equal(remote, &t->parms.raddr) && + ipv6_addr_any(&t->parms.laddr) && (t->dev->flags & IFF_UP)) return t; } -- 2.53.0