From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8B823233D69; Mon, 10 Mar 2025 17:40:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741628442; cv=none; b=SLhcz7AZQDvBr4cWRyOYvK7gRvzD+7P2OmM51gAEGhuEkLauLlFA+O97vwAfTOeeLqdIA3FVv32jmMWzV3oHtkLIvJzvuuL7kLWQ5P4FvKBlkTEMyET2jV2SGJmTKtSwGktlWqEQYMvuAF8i48GC9dWGjcjKfbLRcddz21OiZv4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741628442; c=relaxed/simple; bh=8iV0rBZRO+bupJXd6VDAHMWl0gmP4FmoAd67YVj0mQA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bQBiJG52lF6wILEqaALZtKk+LQA64d0Cv0nUmUhcmRuFvD6J0ThXgkRaF3lXFgM/WStBr9A7uLn8LEmtjmUECYlkl3YThWHNYNOJ9xEDqmekKT26u6XlBn327PXvak1OdfOn9lK4pvzTjJL9spl+b+A4ZAdrfG2FBWGRk/n5Q+0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PG0FE6a5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="PG0FE6a5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11581C4CEF0; Mon, 10 Mar 2025 17:40:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741628442; bh=8iV0rBZRO+bupJXd6VDAHMWl0gmP4FmoAd67YVj0mQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PG0FE6a5QJKnY8lPU9zf30F1ZfBopSdR0EEiLvKlWGlgdQaZIlDAsS/2zJVzvgze1 PGVKD699D7pmYQZ5oLMA/XlIJBmuhfw9TQUOPnbF47AM/dvL1FxkkncfIKtCmyiSFK WPHjQBARIrch8P555k2l9ndLrCLhc5OaIrkTDZqo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tom Herbert , Justin Iurman , Paolo Abeni , Sasha Levin Subject: [PATCH 6.1 060/109] net: ipv6: fix dst ref loop in ila lwtunnel Date: Mon, 10 Mar 2025 18:06:44 +0100 Message-ID: <20250310170429.958227862@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170427.529761261@linuxfoundation.org> References: <20250310170427.529761261@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org 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: Justin Iurman [ Upstream commit 0e7633d7b95b67f1758aea19f8e85621c5f506a3 ] This patch follows commit 92191dd10730 ("net: ipv6: fix dst ref loops in rpl, seg6 and ioam6 lwtunnels") and, on a second thought, the same patch is also needed for ila (even though the config that triggered the issue was pathological, but still, we don't want that to happen). Fixes: 79ff2fc31e0f ("ila: Cache a route to translated address") Cc: Tom Herbert Signed-off-by: Justin Iurman Link: https://patch.msgid.link/20250304181039.35951-1-justin.iurman@uliege.be Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/ipv6/ila/ila_lwt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ipv6/ila/ila_lwt.c b/net/ipv6/ila/ila_lwt.c index 9d37f7164e732..6d37dda3d26fc 100644 --- a/net/ipv6/ila/ila_lwt.c +++ b/net/ipv6/ila/ila_lwt.c @@ -88,7 +88,8 @@ static int ila_output(struct net *net, struct sock *sk, struct sk_buff *skb) goto drop; } - if (ilwt->connected) { + /* cache only if we don't create a dst reference loop */ + if (ilwt->connected && orig_dst->lwtstate != dst->lwtstate) { local_bh_disable(); dst_cache_set_ip6(&ilwt->dst_cache, dst, &fl6.saddr); local_bh_enable(); -- 2.39.5