From patchwork Fri Jul 5 14:52:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dichtel X-Patchwork-Id: 13725221 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-wm1-f99.google.com (mail-wm1-f99.google.com [209.85.128.99]) (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 F11FC154C18 for ; Fri, 5 Jul 2024 14:53:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.99 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720191187; cv=none; b=CcHMJhrS3BTSDQmGvo3q/1QBu/sE71u4FxZ9rMeACAY6CQXvYUW9s3wMs1QOrhCsCcTWJsQcXhfB1J8dJ2beN2Dh+YHPqC9kC+Yh9qIAXYKi8Dxev2ouFoXUOnADmwu1ADHRFuu8j4O94XxAY/ADzkcbMtNNmWhqaqlUAGYLrr0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720191187; c=relaxed/simple; bh=F18MNQqMgi2s1pXAA8VazUOW/a2/fCiXeYMprACDpHo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Y7tnr8VN0a9GhFbfl8zaQt7vr7YXh35TPb37lFht4d5roaD08eWw4BVx6+ZngwCCrtsv6gwBE1oJWvfZl+JrCrN514eyRbgsSguZ6hoiemnM6/QZJS2DMpjYuNFaZLXDHkmk8NVKMEC4kxbCOxhAr+gu8bq4sxuexrf9bVysZT4= 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=encaNi7G; arc=none smtp.client-ip=209.85.128.99 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="encaNi7G" Received: by mail-wm1-f99.google.com with SMTP id 5b1f17b1804b1-426526d3051so5726555e9.1 for ; Fri, 05 Jul 2024 07:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google; t=1720191184; x=1720795984; 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=Cua0A6GEdu0iOk0GUptHeWMm27awSaljV0LV/Qv+59A=; b=encaNi7GOlrKYBKwmzrvXcrkPfMLu2jnNRiVKRM2Eh71Q8u08shElZhWMePgZjyzCH 6I/+GoyWJqTOU+rm1RRhdCSiOKhPUqXKPvnN2hm8/mgmI5LwLMnvFw7G34ZxM6GjRti4 rr5POLDD5uZfr3STibRKCwC98e1E0ZxsHQH0LqnoNnpZHrl9DSn1U8F79gfsmcpPMicp HKn/JuH591G7kCdouYw5PGsBVmFPa3mFhxaAtG05c7mSZBAHNe2BIWgETwtREy2iwY2i ZUTKPhm4RZLaRDl+N5cDbCmbO46SQ9bwswvlxgcf7aaFua5YBBK7m/S0vNgtHaJcb/jf 2q1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720191184; x=1720795984; 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=Cua0A6GEdu0iOk0GUptHeWMm27awSaljV0LV/Qv+59A=; b=AP3tht09T3TiPU2GC592huA9tGR5+opG16G5ck/NPDnLH1c5ESVeHPXIM0IL7hzemX 1a7gZr7JhqVmPTV4ETUYJWGaiBuV7Nq0mCxmGkEjgSvwFNVHriyT+dAZKU9obv6EfNQ3 AQeMJAdN+yC2yvHi85NNAxAZyfwUImdfWMH+GzZHTigS8szvjMkwWemMyM70aP422/GD TjvyF4OtRfURYe48++Px5reID2OJCS9Z+tbZPpk2SJRX1l25LJu/sGe8rOuCevup8zKU PyhONIjyw7BQKzG2wMmdSZokeRZJ7bgXzLKCIfeGQd0wdjH8eDwyvQ8vUyd3cd2bNT7L Clhg== X-Forwarded-Encrypted: i=1; AJvYcCUh2OluFC3pUFYEAf8Ln5/0bI+dsyietACqGtFGOVFXXW9Oxbek6h3RdEi1+ctXpDJKIrm5Zb0FJrnqmcGfu0jdlHAWvGB7 X-Gm-Message-State: AOJu0Yy2DiALgidW0fzB1H5p2aERfr/UlUJiAP9w5LBtK0my/NecjsL+ Wm7BSkcuCzMfmlPXeMJX4lOwnau2RTWRQ1NF0hobolhec+cCf+VFdrEQnLh8h8Q9LU3Vq21GuS4 S7zrKYUBupuP29/BVQL2AxEJ9NYepzfq5 X-Google-Smtp-Source: AGHT+IH9MttpwefKxSrmvypAnuQVniG8F6vZL0IbtrTqPdUBDTZbEsd+LavOwor5RyVYzU89haCcdqOITvr1 X-Received: by 2002:a1c:4c15:0:b0:425:5f73:e2e1 with SMTP id 5b1f17b1804b1-4264a3d9500mr42617415e9.22.1720191184117; Fri, 05 Jul 2024 07:53:04 -0700 (PDT) Received: from smtpservice.6wind.com ([185.13.181.2]) by smtp-relay.gmail.com with ESMTP id 5b1f17b1804b1-4264a2fc94esm1385335e9.47.2024.07.05.07.53.03; Fri, 05 Jul 2024 07:53:04 -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 CD86C602FC; Fri, 5 Jul 2024 16:53:03 +0200 (CEST) Received: from dichtel by bretzel with local (Exim 4.94.2) (envelope-from ) id 1sPkJ5-007Cqg-H2; Fri, 05 Jul 2024 16:53:03 +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 v2 1/4] ipv4: fix source address selection with route leak Date: Fri, 5 Jul 2024 16:52:12 +0200 Message-ID: <20240705145302.1717632-2-nicolas.dichtel@6wind.com> X-Mailer: git-send-email 2.43.1 In-Reply-To: <20240705145302.1717632-1-nicolas.dichtel@6wind.com> References: <20240705145302.1717632-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: 8cbb512c923d ("net: Add source address lookup op for VRF") Signed-off-by: Nicolas Dichtel --- net/ipv4/fib_semantics.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index f669da98d11d..459082f4936d 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c @@ -2270,6 +2270,13 @@ 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 = 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); + } }