mpls: Set rt->rt_nhn just before returning from mpls_nh_build_multi().
Subsystems (2)
PATCH 1/1 mpls: Set rt->rt_nhn just before returning from mpls_nh_build_multi().
Commit f0914b8436c5 ("mpls: Hold dev refcnt for mpls_nh.") added change_nexthops() loop to call netdev_put() for the nexthop devices before freeing mpls_route.
Then, mpls_nh_build_multi() was also changed to avoid iterating uninitialised nexthops in mpls_rt_free_rcu().
However, setting rt->rt_nhn to 0 at the entry of mpls_nh_build_multi() makes the following change_nexthops() no-op.
Let's set rt->rt_nhn just before returning from mpls_nh_build_multi().
--- net/mpls/af_mpls.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/mpls/af_mpls.c +5 -3
@@ -922,8 +922,7 @@ static int mpls_nh_build_multi(struct mpls_route_config *cfg,struct nlattr *nla_via, *nla_newdst;int remaining = cfg->rc_mp_len;int err =0 ; - - rt->rt_nhn =0 ; +u8 nhs =0 ;change_nexthops (rt) {int attrlen;
@@ -959,12 +958,15 @@ static int mpls_nh_build_multi(struct mpls_route_config *cfg, rt->rt_nhn_alive--; rtnh =rtnh_next (rtnh, &remaining); - rt->rt_nhn++; + nhs++; }endfor_nexthops (rt); + rt->rt_nhn = nhs; +return 0 ; errout: + rt->rt_nhn = nhs;return err; }
Signature · 1 line
2.55.0.229.g6434b31f56-goog
This patch was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:
Quoted 8 lines · On Thu, 16 Jul 2026 17:06:07 +0000 you wrote:
Commit
f0914b8436c5("mpls: Hold dev refcnt formpls_nh.") addedchange_nexthops()loop to callnetdev_put()for the nexthop devices before freeingmpls_route.Then,
mpls_nh_build_multi()was also changed to avoid iterating uninitialised nexthops inmpls_rt_free_rcu().[...]
Here is the summary with links:
- [v1,net] mpls: Set rt->rt_nhn just before returning from mpls_nh_build_multi().
https://git.kernel.org/netdev/net/c/3671f0419d90
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html