* [PATCH net] net/ipv6: Remove extra call to ip6_convert_metrics for multipath case
@ 2018-09-27 0:35 dsahern
2018-09-27 2:58 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: dsahern @ 2018-09-27 0:35 UTC (permalink / raw)
To: netdev; +Cc: David Ahern
From: David Ahern <dsahern@gmail.com>
The change to move metrics from the dst to rt6_info moved the call
to ip6_convert_metrics from ip6_route_add to ip6_route_info_create. In
doing so it makes the call in ip6_route_info_append redundant and
actually leaks the metrics installed as part of the ip6_route_info_create.
Remove the now unnecessary call.
Fixes: d4ead6b34b67f ("net/ipv6: move metrics from dst to rt6_info")
Signed-off-by: David Ahern <dsahern@gmail.com>
---
net/ipv6/route.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index d28f83e01593..570f158253b9 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -4293,11 +4293,6 @@ static int ip6_route_info_append(struct net *net,
if (!nh)
return -ENOMEM;
nh->fib6_info = rt;
- err = ip6_convert_metrics(net, rt, r_cfg);
- if (err) {
- kfree(nh);
- return err;
- }
memcpy(&nh->r_cfg, r_cfg, sizeof(*r_cfg));
list_add_tail(&nh->next, rt6_nh_list);
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH net] net/ipv6: Remove extra call to ip6_convert_metrics for multipath case
2018-09-27 0:35 [PATCH net] net/ipv6: Remove extra call to ip6_convert_metrics for multipath case dsahern
@ 2018-09-27 2:58 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2018-09-27 2:58 UTC (permalink / raw)
To: dsahern; +Cc: netdev, dsahern
From: dsahern@kernel.org
Date: Wed, 26 Sep 2018 17:35:14 -0700
> From: David Ahern <dsahern@gmail.com>
>
> The change to move metrics from the dst to rt6_info moved the call
> to ip6_convert_metrics from ip6_route_add to ip6_route_info_create. In
> doing so it makes the call in ip6_route_info_append redundant and
> actually leaks the metrics installed as part of the ip6_route_info_create.
> Remove the now unnecessary call.
>
> Fixes: d4ead6b34b67f ("net/ipv6: move metrics from dst to rt6_info")
> Signed-off-by: David Ahern <dsahern@gmail.com>
Applied and queued up for -stable, thanks David.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-09-27 9:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-27 0:35 [PATCH net] net/ipv6: Remove extra call to ip6_convert_metrics for multipath case dsahern
2018-09-27 2:58 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).