ipv6: Allow the l3mdev to be a loopback

There is no way currently for an IPv6 client connect using a loopback
address in a VRF, whereas for IPv4 the loopback address can be added:

    $ sudo ip addr add dev vrfred 127.0.0.1/8
    $ sudo ip -6 addr add ::1/128 dev vrfred
    RTNETLINK answers: Cannot assign requested address

So allow ::1 to be configured on an L3 master device. In order for
this to be usable ip_route_output_flags needs to not consider ::1 to
be a link scope address (since oif == l3mdev and so it would be
dropped), and ipv6_rcv needs to consider the l3mdev to be a loopback
device so that it doesn't drop the packets.

Signed-off-by: Robert Shearman <rshearma@vyatta.att-mail.com>
Signed-off-by: Mike Manning <mmanning@vyatta.att-mail.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index d4733160e6b7660940fdf66bb48549289ac0e086..bfe3ec7ecb145f6063138a4cc5cc6c9abbc65ac6 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -997,6 +997,7 @@ ipv6_add_addr(struct inet6_dev *idev, struct ifa6_config *cfg,
        if (addr_type == IPV6_ADDR_ANY ||
            addr_type & IPV6_ADDR_MULTICAST ||
            (!(idev->dev->flags & IFF_LOOPBACK) &&
+            !netif_is_l3_master(idev->dev) &&
             addr_type & IPV6_ADDR_LOOPBACK))
                return ERR_PTR(-EADDRNOTAVAIL);
 

diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index 6242682be876fd1193c8c3dac2b156265830076a..96577e742afd496eaed410395620be5a8e24430f 100644 (file)
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
@@ -178,7 +178,8 @@ static struct sk_buff *ip6_rcv_core(struct sk_buff *skb, struct net_device *dev,
         */
        if ((ipv6_addr_loopback(&hdr->saddr) ||
             ipv6_addr_loopback(&hdr->daddr)) &&
-            !(dev->flags & IFF_LOOPBACK))
+           !(dev->flags & IFF_LOOPBACK) &&
+           !netif_is_l3_master(dev))
                goto err;
 
        /* RFC4291 Errata ID: 3480

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 21a919e74fbf8a7b7e54ac17914fa7c327fb43e4..938db8ae23161ef645adbe5002edf522c9c91a8c 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2071,7 +2071,8 @@ struct dst_entry *ip6_route_output_flags(struct net *net, const struct sock *sk,
 {
        bool any_src;
 
-       if (rt6_need_strict(&fl6->daddr)) {
+       if (ipv6_addr_type(&fl6->daddr) &
+           (IPV6_ADDR_MULTICAST | IPV6_ADDR_LINKLOCAL)) {
                struct dst_entry *dst;
 
                dst = l3mdev_link_scope_lookup(net, fl6);