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>

diff --git a/include/net/sock.h b/include/net/sock.h
index 66fd3951e6f39a2f6f378ae399c5acbdc79d7947..73b7830b0bb880e12a5f68900127dfb2a1762894 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -72,6 +72,7 @@
 #include <net/tcp_states.h>
 #include <linux/net_tstamp.h>
 #include <net/smc.h>
+#include <net/l3mdev.h>
 
 /*
  * This structure really needs to be cleaned up.
@@ -2399,4 +2400,23 @@ static inline void sk_pacing_shift_update(struct sock *sk, int val)
        sk->sk_pacing_shift = val;
 }
 
+/* if a socket is bound to a device, check that the given device
+ * index is either the same or that the socket is bound to an L3
+ * master device and the given device index is also enslaved to
+ * that L3 master
+ */
+static inline bool sk_dev_equal_l3scope(struct sock *sk, int dif)
+{
+       int mdif;
+
+       if (!sk->sk_bound_dev_if || sk->sk_bound_dev_if == dif)
+               return true;
+
+       mdif = l3mdev_master_ifindex_by_index(sock_net(sk), dif);
+       if (mdif && mdif == sk->sk_bound_dev_if)
+               return true;
+
+       return false;
+}
+
 #endif /* _SOCK_H */

diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index a1f9187130067dba6d485dbaade21d62080fcbf6..fbf08ce3f5ab75c3d21c20741421f4153c4dcd67 100644 (file)
--- 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;
                        }

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index aa12a26a96c6907a19f7759048649ec5a2384586..c0f7e69f2e6cd65bb779519c7b5fcb77b9b65c7a 100644 (file)
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -176,8 +176,7 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
                        /* If interface is set while binding, indices
                         * must coincide.
                         */
-                       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))
                                return -EINVAL;
 
                        sk->sk_bound_dev_if = usin->sin6_scope_id;