Skip to contentSkip to conversation

ipv6: take care of disable_policy when restoring routes

PATCH Applied Nicolas Dichtel 3 participants 3 messages Jun 23, 2022 – Jun 28, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ipv6: take care of disable_policy when restoring routes

When routes corresponding to addresses are restored by fixup_permanent_addr(), the dst_nopolicy parameter was not set. The typical use case is a user that configures an address on a down interface and then put this interface up.

Let's take care of this flag in addrconf_f6i_alloc(), so that every callers benefit ont it.

CC David Forster <[email protected]>
Fixes df789fe75206 ("ipv6: Provide ipv6 version of "disable_policy" sysctl")

---

I choose to be conservative in my patch, thus I filter anycast addresses. But I don't see why this flag is not set on anycast routes. Any thoughts about this?

 net/ipv6/addrconf.c | 4 ----
 net/ipv6/route.c    | 9 ++++++++-
 2 files changed, 8 insertions(+), 5 deletions(-)
net/ipv6/addrconf.c +0 -4
index 1b1932502e9e..5864cbc30db6 100644
@@ -1109,10 +1109,6 @@ ipv6_add_addr(struct inet6_dev *idev, struct ifa6_config *cfg,
 		goto out;
 	}
 
-	if (net->ipv6.devconf_all->disable_policy ||
-	    idev->cnf.disable_policy)
-		f6i->dst_nopolicy = true;
-
 	neigh_parms_data_state_setall(idev->nd_parms);
 
 	ifa->addr = *cfg->pfx;
net/ipv6/route.c +8 -1
index d25dc83bac62..828355710c57 100644
@@ -4569,8 +4569,15 @@ struct fib6_info *addrconf_f6i_alloc(struct net *net,
 	}
 
 	f6i = ip6_route_info_create(&cfg, gfp_flags, NULL);
-	if (!IS_ERR(f6i))
+	if (!IS_ERR(f6i)) {
 		f6i->dst_nocount = true;
+
+		if (!anycast &&
+		    (net->ipv6.devconf_all->disable_policy ||
+		     idev->cnf.disable_policy))
+			f6i->dst_nopolicy = true;
+	}
+
 	return f6i;
 }
 
Signature · 1 line
2.33.0
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 13 lines · Nicolas Dichtel

When routes corresponding to addresses are restored by fixup_permanent_addr(), the dst_nopolicy parameter was not set. The typical use case is a user that configures an address on a down interface and then put this interface up.

Let's take care of this flag in addrconf_f6i_alloc(), so that every callers benefit ont it.

CC David Forster <[email protected]>
Fixes df789fe75206 ("ipv6: Provide ipv6 version of "disable_policy" sysctl")
Quoted 5 lines

---

I choose to be conservative in my patch, thus I filter anycast addresses. But I don't see why this flag is not set on anycast routes. Any thoughts about this?

no strong opinions here.

Quoted 31 lines
 net/ipv6/addrconf.c | 4 ----
 net/ipv6/route.c    | 9 ++++++++-
 2 files changed, 8 insertions(+), 5 deletions(-)
net/ipv6/addrconf.c +0 -4
index 1b1932502e9e..5864cbc30db6 100644
@@ -1109,10 +1109,6 @@ ipv6_add_addr(struct inet6_dev *idev, struct ifa6_config *cfg,
 		goto out;
 	}
 
-	if (net->ipv6.devconf_all->disable_policy ||
-	    idev->cnf.disable_policy)
-		f6i->dst_nopolicy = true;
-
 	neigh_parms_data_state_setall(idev->nd_parms);
 
 	ifa->addr = *cfg->pfx;
net/ipv6/route.c +1 -1
index d25dc83bac62..828355710c57 100644
@@ -4569,8 +4569,15 @@ struct fib6_info *addrconf_f6i_alloc(struct net *net,
 	}
 
 	f6i = ip6_route_info_create(&cfg, gfp_flags, NULL);
-	if (!IS_ERR(f6i))
+	if (!IS_ERR(f6i)) {
 		f6i->dst_nocount = true;

net/ipv6/route.c struct fib6_info *addrconf_f6i_alloc(struct net *net, · line 4583

Quoted 10 lines
net/ipv6/route.c +7 -0
+
+		if (!anycast &&
+		    (net->ipv6.devconf_all->disable_policy ||
+		     idev->cnf.disable_policy))
+			f6i->dst_nopolicy = true;
+	}
+
 	return f6i;
 }
 
#2 lore raw
In reply to Nicolas Dichtel
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:

Quoted 9 lines · On Thu, 23 Jun 2022 14:00:15 +0200 you wrote:

When routes corresponding to addresses are restored by fixup_permanent_addr(), the dst_nopolicy parameter was not set. The typical use case is a user that configures an address on a down interface and then put this interface up.

Let's take care of this flag in addrconf_f6i_alloc(), so that every callers benefit ont it.

[...]

Here is the summary with links:
- [net] ipv6: take care of disable_policy when restoring routes

    https://git.kernel.org/netdev/net/c/3b0dc529f56b

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html