ipv6, token: allow for clearing the current device token (47e27d5e) · Commits · 戴 / test

The original tokenized iid support implemented via ("net: ipv6: add tokenized interface identifier support") didn't allow for clearing a device token as it was intended that this addressing mode was the only one active for globally scoped IPv6 addresses. Later we relaxed that restriction via ("net: ipv6: only invalidate previously tokenized addresses"), and we should also allow for clearing tokens as there's no good reason why it shouldn't be allowed. Fixes: ("net: ipv6: only invalidate previously tokenized addresses") Reported-by:

Robin H. Johnson <robbat2@gentoo.org> Signed-off-by:

Daniel Borkmann <daniel@iogearbox.net> Cc: Hannes Frederic Sowa <hannes@stressinduktion.org> Acked-by:

Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/ipv6/addrconf.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -4995,15 +4995,13 @@ static int inet6_set_iftoken(struct inet6_dev idev, struct in6_addr token)
		{
		struct inet6_ifaddr *ifp;
		struct net_device *dev = idev->dev;
		bool update_rs = false;
		bool clear_token, update_rs = false;
		struct in6_addr ll_addr;

		ASSERT_RTNL();

		if (!token)
		return -EINVAL;
		if (ipv6_addr_any(token))
		return -EINVAL;
		if (dev->flags & (IFF_LOOPBACK \| IFF_NOARP))
		return -EINVAL;
		if (!ipv6_accept_ra(idev))
		@@ -5018,10 +5016,13 @@ static int inet6_set_iftoken(struct inet6_dev idev, struct in6_addr token)

		write_unlock_bh(&idev->lock);

		clear_token = ipv6_addr_any(token);
		if (clear_token)
		goto update_lft;

		if (!idev->dead && (idev->if_flags & IF_READY) &&
		!ipv6_get_lladdr(dev, &ll_addr, IFA_F_TENTATIVE \|
		IFA_F_OPTIMISTIC)) {

		/* If we're not ready, then normal ifup will take care
		* of this. Otherwise, we need to request our rs here.
		*/
		@@ -5029,6 +5030,7 @@ static int inet6_set_iftoken(struct inet6_dev idev, struct in6_addr token)
		update_rs = true;
		}

		update_lft:
		write_lock_bh(&idev->lock);

		if (update_rs) {

Admin message