net: ipv6: Remove addresses for failures with strict DAD
If DAD fails with accept_dad set to 2, global addresses and host routes are incorrectly left in place. Even though disable_ipv6 is set, contrary to documentation, the addresses are not dynamically deleted from the interface. It is only on a subsequent link down/up that these are removed. The fix is not only to set the disable_ipv6 flag, but also to call addrconf_ifdown(), which is the action to carry out when disabling IPv6. This results in the addresses and routes being deleted immediately. The DAD failure for the LL addr is determined as before via netlink, or by the absence of the LL addr (which also previously would have had to be checked for in case of an intervening link down and up). As the call to addrconf_ifdown() requires an rtnl lock, the logic to disable IPv6 when DAD fails is moved to addrconf_dad_work(). Previous behavior: root@vm1:/# sysctl net.ipv6.conf.eth3.accept_dad=2 net.ipv6.conf.eth3.accept_dad = 2 root@vm1:/# ip -6 addr add 2000::10/64 dev eth3 root@vm1:/# ip link set up eth3 root@vm1:/# ip -6 addr show dev eth3 5: eth3: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qlen 1000 inet6 2000::10/64 scope global valid_lft forever preferred_lft forever inet6 fe80::5054:ff:fe43:dd5a/64 scope link tentative dadfailed valid_lft forever preferred_lft forever root@vm1:/# ip -6 route show dev eth3 2000::/64 proto kernel metric 256 fe80::/64 proto kernel metric 256 root@vm1:/# ip link set down eth3 root@vm1:/# ip link set up eth3 root@vm1:/# ip -6 addr show dev eth3 root@vm1:/# ip -6 route show dev eth3 root@vm1:/# New behavior: root@vm1:/# sysctl net.ipv6.conf.eth3.accept_dad=2 net.ipv6.conf.eth3.accept_dad = 2 root@vm1:/# ip -6 addr add 2000::10/64 dev eth3 root@vm1:/# ip link set up eth3 root@vm1:/# ip -6 addr show dev eth3 root@vm1:/# ip -6 route show dev eth3 root@vm1:/# Signed-off-by: Mike Manning <mmanning@brocade.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
53dc65d4d3
commit
85b51b1211
|
@ -1872,7 +1872,6 @@ static int addrconf_dad_end(struct inet6_ifaddr *ifp)
|
|||
|
||||
void addrconf_dad_failure(struct inet6_ifaddr *ifp)
|
||||
{
|
||||
struct in6_addr addr;
|
||||
struct inet6_dev *idev = ifp->idev;
|
||||
struct net *net = dev_net(ifp->idev->dev);
|
||||
|
||||
|
@ -1934,18 +1933,6 @@ void addrconf_dad_failure(struct inet6_ifaddr *ifp)
|
|||
in6_ifa_put(ifp2);
|
||||
lock_errdad:
|
||||
spin_lock_bh(&ifp->lock);
|
||||
} else if (idev->cnf.accept_dad > 1 && !idev->cnf.disable_ipv6) {
|
||||
addr.s6_addr32[0] = htonl(0xfe800000);
|
||||
addr.s6_addr32[1] = 0;
|
||||
|
||||
if (!ipv6_generate_eui64(addr.s6_addr + 8, idev->dev) &&
|
||||
ipv6_addr_equal(&ifp->addr, &addr)) {
|
||||
/* DAD failed for link-local based on MAC address */
|
||||
idev->cnf.disable_ipv6 = 1;
|
||||
|
||||
pr_info("%s: IPv6 being disabled!\n",
|
||||
ifp->idev->dev->name);
|
||||
}
|
||||
}
|
||||
|
||||
errdad:
|
||||
|
@ -3821,6 +3808,7 @@ static void addrconf_dad_work(struct work_struct *w)
|
|||
dad_work);
|
||||
struct inet6_dev *idev = ifp->idev;
|
||||
struct in6_addr mcaddr;
|
||||
bool disable_ipv6 = false;
|
||||
|
||||
enum {
|
||||
DAD_PROCESS,
|
||||
|
@ -3837,6 +3825,24 @@ static void addrconf_dad_work(struct work_struct *w)
|
|||
} else if (ifp->state == INET6_IFADDR_STATE_ERRDAD) {
|
||||
action = DAD_ABORT;
|
||||
ifp->state = INET6_IFADDR_STATE_POSTDAD;
|
||||
|
||||
if (idev->cnf.accept_dad > 1 && !idev->cnf.disable_ipv6 &&
|
||||
!(ifp->flags & IFA_F_STABLE_PRIVACY)) {
|
||||
struct in6_addr addr;
|
||||
|
||||
addr.s6_addr32[0] = htonl(0xfe800000);
|
||||
addr.s6_addr32[1] = 0;
|
||||
|
||||
if (!ipv6_generate_eui64(addr.s6_addr + 8, idev->dev) &&
|
||||
ipv6_addr_equal(&ifp->addr, &addr)) {
|
||||
/* DAD failed for link-local based on MAC */
|
||||
idev->cnf.disable_ipv6 = 1;
|
||||
|
||||
pr_info("%s: IPv6 being disabled!\n",
|
||||
ifp->idev->dev->name);
|
||||
disable_ipv6 = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
spin_unlock_bh(&ifp->lock);
|
||||
|
||||
|
@ -3845,6 +3851,8 @@ static void addrconf_dad_work(struct work_struct *w)
|
|||
goto out;
|
||||
} else if (action == DAD_ABORT) {
|
||||
addrconf_dad_stop(ifp, 1);
|
||||
if (disable_ipv6)
|
||||
addrconf_ifdown(idev->dev, 0);
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue