diff options
| author |   David Ahern <dsahern@gmail.com> | 2018-01-04 14:03:54 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-01-08 14:11:18 -0500 |
| commit | 54dc3e3324829d346c959ff774626d9c6c9a65b5 (patch) | |
| tree | f96d0686fcc8f9c55c47981c6edc70cfe827aab7 /net/ipv6/datagram.c | |
| parent | sh_eth: remove sh_eth_plat_data::edmac_endian (diff) | |
| download | linux-dev-54dc3e3324829d346c959ff774626d9c6c9a65b5.tar.xz linux-dev-54dc3e3324829d346c959ff774626d9c6c9a65b5.zip | |
net: ipv6: Allow connect to linklocal address from socket bound to vrf
Allow a process bound to a VRF to connect to a linklocal address.
Currently, this fails because of a mismatch between the scope of the
linklocal address and the sk_bound_dev_if inherited by the VRF binding:
$ ssh -6 fe80::70b8:cff:fedd:ead8%eth1
ssh: connect to host fe80::70b8:cff:fedd:ead8%eth1 port 22: Invalid argument
Relax the scope check to allow the socket to be bound to the same L3
device as the scope id.
This makes ipv6 linklocal consistent with other relaxed checks enabled
by commits 1ff23beebdd3 ("net: l3mdev: Allow send on enslaved interface")
and 7bb387c5ab12a ("net: Allow IP_MULTICAST_IF to set index to L3 slave").
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/datagram.c')
| -rw-r--r-- | net/ipv6/datagram.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index a1f918713006..fbf08ce3f5ab 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c @@ -221,8 +221,7 @@ ipv4_connected: if (__ipv6_addr_needs_scope_id(addr_type)) { if (addr_len >= sizeof(struct sockaddr_in6) && usin->sin6_scope_id) { - if (sk->sk_bound_dev_if && - sk->sk_bound_dev_if != usin->sin6_scope_id) { + if (!sk_dev_equal_l3scope(sk, usin->sin6_scope_id)) { err = -EINVAL; goto out; } |