linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: David Ahern <dsa@cumulusnetworks.com>,
	Netdev <netdev@vger.kernel.org>,
	WireGuard mailing list <wireguard@lists.zx2c4.com>,
	LKML <linux-kernel@vger.kernel.org>,
	YOSHIFUJI Hideaki <hideaki.yoshifuji@miraclelinux.com>,
	Hannes Frederic Sowa <hannes@stressinduktion.org>
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>
Subject: [PATCH v3] ip6_output: ensure flow saddr actually belongs to device
Date: Mon, 14 Nov 2016 00:28:13 +0100	[thread overview]
Message-ID: <20161113232813.28926-1-Jason@zx2c4.com> (raw)
In-Reply-To: <27cccef1-06d9-74b3-5b8a-912850119a76@cumulusnetworks.com>

This puts the IPv6 routing functions in parity with the IPv4 routing
functions. Namely, we now check in v6 that if a flowi6 requests an
saddr, the returned dst actually corresponds to a net device that has
that saddr. This mirrors the v4 logic with __ip_dev_find in
__ip_route_output_key_hash. In the event that the returned dst is not
for a dst with a dev that has the saddr, we return -EINVAL, just like
v4; this makes it easy to use the same error handlers for both cases.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: David Ahern <dsa@cumulusnetworks.com>
---
Changes from v2:
    It turns out ipv6_chk_addr already has the device enumeration
    logic that we need by simply passing NULL.

 net/ipv6/ip6_output.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 6001e78..b3b5cb6 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -926,6 +926,10 @@ static int ip6_dst_lookup_tail(struct net *net, const struct sock *sk,
 	int err;
 	int flags = 0;
 
+	if (!ipv6_addr_any(&fl6->saddr) &&
+	    !ipv6_chk_addr(net, &fl6->saddr, NULL, 1))
+		return -EINVAL;
+
 	/* The correct way to handle this would be to do
 	 * ip6_route_get_saddr, and then ip6_route_output; however,
 	 * the route-specific preferred source forces the
-- 
2.10.2

  reply	other threads:[~2016-11-13 23:28 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-11 19:29 Source address fib invalidation on IPv6 Jason A. Donenfeld
2016-11-11 22:14 ` David Ahern
2016-11-12  2:18   ` Jason A. Donenfeld
2016-11-12 15:40     ` Jason A. Donenfeld
2016-11-12 18:14       ` David Ahern
2016-11-12 19:08         ` Jason A. Donenfeld
2016-11-13  0:43           ` Jason A. Donenfeld
2016-11-13  0:51             ` Hannes Frederic Sowa
2016-11-13  1:00               ` Jason A. Donenfeld
2016-11-13 13:23                 ` [PATCH] ip6_output: ensure flow saddr actually belongs to device Jason A. Donenfeld
2016-11-13 16:30                   ` David Ahern
2016-11-13 19:02                     ` [PATCH v2] " Jason A. Donenfeld
2016-11-13 20:45                       ` David Ahern
2016-11-13 23:28                         ` Jason A. Donenfeld [this message]
2016-11-14 16:19                           ` [PATCH v3] " David Ahern
2016-11-14 16:44                           ` Hannes Frederic Sowa
2016-11-14 16:55                             ` David Ahern
2016-11-14 17:04                               ` Hannes Frederic Sowa
2016-11-14 17:17                                 ` David Ahern
2016-11-14 17:33                                   ` Hannes Frederic Sowa
2016-11-14 17:48                                     ` David Ahern
2016-11-14 18:33                                       ` Hannes Frederic Sowa
2016-11-15  0:45                                         ` Jason A. Donenfeld
2016-11-15 14:45                                           ` Hannes Frederic Sowa
2016-11-15 15:26                                             ` David Ahern
2016-11-13 20:19                     ` [PATCH] " Jason A. Donenfeld
2016-11-13 20:39                       ` David Ahern
2016-11-13  0:51             ` Source address fib invalidation on IPv6 Jason A. Donenfeld

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161113232813.28926-1-Jason@zx2c4.com \
    --to=jason@zx2c4.com \
    --cc=dsa@cumulusnetworks.com \
    --cc=hannes@stressinduktion.org \
    --cc=hideaki.yoshifuji@miraclelinux.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=wireguard@lists.zx2c4.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).