From patchwork Mon Jun 24 13:07:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dichtel X-Patchwork-Id: 13709451 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-lj1-f225.google.com (mail-lj1-f225.google.com [209.85.208.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90A7B13D62F for ; Mon, 24 Jun 2024 13:09:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.225 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719234546; cv=none; b=ZviG/AaQRH7mYte2JfR8rfeuQlhcNvEMv+R93+skIgNLQJwdx+j+WOFx+IcBpWssZQa4UPrjuNhP1PMYDriWp9AjNiPFg/Mgm71X8dsOEWS6ie7I3zD+t1Iogpue2/f2CK9/oHaGhN7/0tbYXW6xPXBETI3EEFAu4isivJ5J2E8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719234546; c=relaxed/simple; bh=8oaIXIe0+bbffU+4+tyy8R/V/TlWyVTDw3J9fG4MGsU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fAIpFTcVS0YNpuog5ttTaBgeSfXfrqOk2AMAxONsUkNs+BLKQOFoPDcGEL2rzNspMuKoInGyzlJcJAWq+s8r6/F/UYN2FQuQUOKKJD0rChYugj+e14nPnKt1vy5LZYqQWZoR3oXY+2vfaohSKJzLdUlF0PL164eq0HeOwxgRj3s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=6wind.com; spf=pass smtp.mailfrom=6wind.com; dkim=pass (2048-bit key) header.d=6wind.com header.i=@6wind.com header.b=AQqvyf/W; arc=none smtp.client-ip=209.85.208.225 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=6wind.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=6wind.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=6wind.com header.i=@6wind.com header.b="AQqvyf/W" Received: by mail-lj1-f225.google.com with SMTP id 38308e7fff4ca-2ec1620a956so51598751fa.1 for ; Mon, 24 Jun 2024 06:09:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google; t=1719234543; x=1719839343; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MeLUTTDqDBsmxH/CzCbI0wYe8vQnI0MozaiZWlhCOJE=; b=AQqvyf/WSThIg1dcIPAZ41xmnbVrJWe5IW83frtm4/8PJqpRB3ei1n6tUgiF4i27n6 2fHHfXTLbZ8z0uyIR0jtitNmICVZ2QiAxRfTosXkpKjGbgHWYsxm3QlZ5n68FPkm4LnC nE54t7LC6m/fYQxtbDCjVF+yxcrdrbMbebZmBw8i2QNo4yeQOg7AoAEHrLqsyLBXZLVK HFKeuZSqJOOHWcGZ6Mxmlj//ZvHpZilz6f8ox4CWZOUmOujo4NgRzPgZ1JZtTBOdEZ5m Q2/KWpqRFZC6gYHSZvHgr2jljWQ7D4ogoJVPxoj61/pcGeeS1+PYdFts9oicrBRY2Ok1 vIcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719234543; x=1719839343; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MeLUTTDqDBsmxH/CzCbI0wYe8vQnI0MozaiZWlhCOJE=; b=I0uQEXLVHxOcu9iQCGMzy6Qcs4I3blFyNOGtJq03PEN0Asxw7Mk92+Xq52oPACQW02 334lrer3rhyWfQUqE4cyhrj+HvWZHVR00jq5vFXMBtcG+vevjzWj3GkotJga/Rr32IFS Ogk7pa58La0LLS5488CqmZReLG6XEyFLUd3zEotXku9a9BWZbTW5p4QkAfzWF1dRJ6u4 cAObON1KfWm/VpKjwoq/OcAAAsE3uTUJsVc6InMEPjg/mBlD1MzjWTAsO+7pkB5puyVV jHwWsMfT5Fzr6hreEyX79SOlKqfV12fjIboXsjDsWANGoywfZwuPkX/bc02g8FFK5Pxy p4yA== X-Forwarded-Encrypted: i=1; AJvYcCU9etEe6hD6YlvWC8Q1Xsd2U5Dsq7mMC69wFVPvYP3Vj86oabqi0lprIr4Co00d3hNOQL4WGvPR+jk+MPxy8T76T+ExjvEa X-Gm-Message-State: AOJu0YxXy5AhKYzA5Ff2I/GHP9odBPBvQ630fl6jYXf4HNHvtR3GpcCf 8p9kKQ+uRGGAkih8Z+zchloGQ0ttygurAHTSehWOL23eOcz/LkRj6K4Z7TOLwuUcIBmFa0Lzoob IkzlT9ej6UQihyIOr+G9+g+8tqdQtO+G2 X-Google-Smtp-Source: AGHT+IELmlE6/jT14ZDxmp+y2Ey92cZln6BwHTGXEgEmu0GwEmf4G62NZJLnWwhtXIIPSyY/YKkKI9ZTVudr X-Received: by 2002:a05:651c:22f:b0:2ec:5128:1851 with SMTP id 38308e7fff4ca-2ec5b3197e3mr24276381fa.3.1719234542627; Mon, 24 Jun 2024 06:09:02 -0700 (PDT) Received: from smtpservice.6wind.com ([185.13.181.2]) by smtp-relay.gmail.com with ESMTP id ffacd0b85a97d-366efb23ee2sm95047f8f.105.2024.06.24.06.09.02; Mon, 24 Jun 2024 06:09:02 -0700 (PDT) X-Relaying-Domain: 6wind.com Received: from bretzel (bretzel.dev.6wind.com [10.17.1.57]) by smtpservice.6wind.com (Postfix) with ESMTPS id 5329D603A7; Mon, 24 Jun 2024 15:09:02 +0200 (CEST) Received: from dichtel by bretzel with local (Exim 4.94.2) (envelope-from ) id 1sLjRO-00406A-0g; Mon, 24 Jun 2024 15:09:02 +0200 From: Nicolas Dichtel To: "David S . Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet Cc: David Ahern , netdev@vger.kernel.org, Nicolas Dichtel , stable@vger.kernel.org Subject: [PATCH net 2/4] ipv6: fix source address selection with route leak Date: Mon, 24 Jun 2024 15:07:54 +0200 Message-ID: <20240624130859.953608-3-nicolas.dichtel@6wind.com> X-Mailer: git-send-email 2.43.1 In-Reply-To: <20240624130859.953608-1-nicolas.dichtel@6wind.com> References: <20240624130859.953608-1-nicolas.dichtel@6wind.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org 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: 0d240e7811c4 ("net: vrf: Implement get_saddr for IPv6") Signed-off-by: Nicolas Dichtel --- include/net/ip6_route.h | 19 ++++++++++++------- net/ipv6/ip6_output.c | 1 + net/ipv6/route.c | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index a18ed24fed94..62755fab1b52 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -127,18 +127,23 @@ void rt6_age_exceptions(struct fib6_info *f6i, struct fib6_gc_args *gc_args, static inline int ip6_route_get_saddr(struct net *net, struct fib6_info *f6i, const struct in6_addr *daddr, - unsigned int prefs, + unsigned int prefs, int l3mdev_index, struct in6_addr *saddr) { + struct net_device *l3mdev; + struct net_device *dev; + bool same_vrf; int err = 0; - if (f6i && f6i->fib6_prefsrc.plen) { + rcu_read_lock(); + l3mdev = dev_get_by_index_rcu(net, l3mdev_index); + dev = f6i ? fib6_info_nh_dev(f6i) : NULL; + same_vrf = l3mdev && l3mdev_master_dev_rcu(dev) == l3mdev; + if (f6i && f6i->fib6_prefsrc.plen && same_vrf) *saddr = f6i->fib6_prefsrc.addr; - } else { - struct net_device *dev = f6i ? fib6_info_nh_dev(f6i) : NULL; - - err = ipv6_dev_get_saddr(net, dev, daddr, prefs, saddr); - } + else + err = ipv6_dev_get_saddr(net, same_vrf ? dev : l3mdev, daddr, prefs, saddr); + rcu_read_unlock(); return err; } diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 27d8725445e3..784424ac4147 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1124,6 +1124,7 @@ static int ip6_dst_lookup_tail(struct net *net, const struct sock *sk, from = rt ? rcu_dereference(rt->from) : NULL; err = ip6_route_get_saddr(net, from, &fl6->daddr, sk ? READ_ONCE(inet6_sk(sk)->srcprefs) : 0, + fl6->flowi6_l3mdev, &fl6->saddr); rcu_read_unlock(); diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 8d72ca0b086d..c9a9506b714d 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -5689,7 +5689,7 @@ static int rt6_fill_node(struct net *net, struct sk_buff *skb, goto nla_put_failure; } else if (dest) { struct in6_addr saddr_buf; - if (ip6_route_get_saddr(net, rt, dest, 0, &saddr_buf) == 0 && + if (ip6_route_get_saddr(net, rt, dest, 0, 0, &saddr_buf) == 0 && nla_put_in6_addr(skb, RTA_PREFSRC, &saddr_buf)) goto nla_put_failure; }