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 0B93F139568 for ; Mon, 29 Jul 2024 08:13:20 +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=1722240801; cv=none; b=pbtZuBkLYsZWytJY3VkJeOCfXQT6HK9CWX/eaZqNGTKxbCR62Ir+OoMpVrqprDVTZpx2c9M4NrfhXD4WdBrWR/spYK8IGKUfSeKDsmRZBV98b/r355Q5y5AKRovJ1cfVT5QxXUe5mUn9UmGiZ8tR7Wjqtdyuqw0SYkUGXdL70js= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722240801; c=relaxed/simple; bh=fLql3e5D3dIV+56NrFjHNEyhn5KU7KuTKK3TeosO97g=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=YrjW9kB8k1ZP46DIBbsBVIAi152dWGhnxvuCZLaliKYPgkMZQe3WJhvIGsO0ndEeJSD9c/ilNKrbaCISzDe3njLVlY84OaJm47aLe+BoGPJkrXtSnX0xTfRaZ369VbZ1ondExoLA9ahP1z9Hxjd9VrQQZ2KKMefgF28L9/YSiHU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2Yo3tqq1; 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="2Yo3tqq1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01EA1C32786; Mon, 29 Jul 2024 08:13:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722240800; bh=fLql3e5D3dIV+56NrFjHNEyhn5KU7KuTKK3TeosO97g=; h=Subject:To:Cc:From:Date:From; b=2Yo3tqq17oFK06LZe0AQQucdHefk+dO4ALNtRQFjRyHOGyURHkiQde/7uQeu53uVo /aFCe1zwR1FsOR3PRqmDdofwtLYzCn7fYty7bcU/2HNqO+ZoUGjtLiiNi+XJZwGfRp 7PzU3Up46dL7sRhwBAOTV8pcVQzTY0XLrpNBKywM= Subject: FAILED: patch "[PATCH] ipv4: fix source address selection with route leak" failed to apply to 5.15-stable tree To: nicolas.dichtel@6wind.com,dsahern@kernel.org,kuba@kernel.org Cc: From: Date: Mon, 29 Jul 2024 10:13:17 +0200 Message-ID: <2024072916-pastrami-suction-5192@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 6807352353561187a718e87204458999dbcbba1b # git commit -s git send-email --to '' --in-reply-to '2024072916-pastrami-suction-5192@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 680735235356 ("ipv4: fix source address selection with route leak") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 6807352353561187a718e87204458999dbcbba1b Mon Sep 17 00:00:00 2001 From: Nicolas Dichtel Date: Wed, 10 Jul 2024 10:14:27 +0200 Subject: [PATCH] ipv4: fix source address selection with route leak By default, an address assigned to the output interface is selected when the source address is not specified. This is problematic when a route, configured in a vrf, uses an interface from another vrf (aka route leak). The original vrf does not own the selected source address. Let's add a check against the output interface and call the appropriate function to select the source address. CC: stable@vger.kernel.org Fixes: 8cbb512c923d ("net: Add source address lookup op for VRF") Signed-off-by: Nicolas Dichtel Reviewed-by: David Ahern Link: https://patch.msgid.link/20240710081521.3809742-2-nicolas.dichtel@6wind.com Signed-off-by: Jakub Kicinski diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index f669da98d11d..8956026bc0a2 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c @@ -2270,6 +2270,15 @@ void fib_select_path(struct net *net, struct fib_result *res, fib_select_default(fl4, res); check_saddr: - if (!fl4->saddr) - fl4->saddr = fib_result_prefsrc(net, res); + if (!fl4->saddr) { + struct net_device *l3mdev; + + l3mdev = dev_get_by_index_rcu(net, fl4->flowi4_l3mdev); + + if (!l3mdev || + l3mdev_master_dev_rcu(FIB_RES_DEV(*res)) == l3mdev) + fl4->saddr = fib_result_prefsrc(net, res); + else + fl4->saddr = inet_select_addr(l3mdev, 0, RT_SCOPE_LINK); + } }