* [Patch net] ipv6: fix double refcount of fib6_metrics
@ 2018-08-03 6:20 Cong Wang
2018-08-03 19:38 ` David Miller
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Cong Wang @ 2018-08-03 6:20 UTC (permalink / raw)
To: netdev; +Cc: Cong Wang, Sabrina Dubroca, David Ahern
All the callers of ip6_rt_copy_init()/rt6_set_from() hold refcnt
of the "from" fib6_info, so there is no need to hold fib6_metrics
refcnt again, because fib6_metrics refcnt is only released when
fib6_info is gone, that is, they have the same life time, so the
whole fib6_metrics refcnt can be removed actually.
This fixes a kmemleak warning reported by Sabrina.
Fixes: 93531c674315 ("net/ipv6: separate handling of FIB entries from dst based routes")
Reported-by: Sabrina Dubroca <sd@queasysnail.net>
Cc: Sabrina Dubroca <sd@queasysnail.net>
Cc: David Ahern <dsahern@gmail.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
---
net/ipv6/route.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index ec18b3ce8b6d..7208c16302f6 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -978,10 +978,6 @@ static void rt6_set_from(struct rt6_info *rt, struct fib6_info *from)
rt->rt6i_flags &= ~RTF_EXPIRES;
rcu_assign_pointer(rt->from, from);
dst_init_metrics(&rt->dst, from->fib6_metrics->metrics, true);
- if (from->fib6_metrics != &dst_default_metrics) {
- rt->dst._metrics |= DST_METRICS_REFCOUNTED;
- refcount_inc(&from->fib6_metrics->refcnt);
- }
}
/* Caller must already hold reference to @ort */
--
2.14.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Patch net] ipv6: fix double refcount of fib6_metrics
2018-08-03 6:20 [Patch net] ipv6: fix double refcount of fib6_metrics Cong Wang
@ 2018-08-03 19:38 ` David Miller
2018-08-06 0:23 ` David Miller
2018-08-12 23:08 ` David Ahern
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2018-08-03 19:38 UTC (permalink / raw)
To: xiyou.wangcong; +Cc: netdev, sd, dsahern
From: Cong Wang <xiyou.wangcong@gmail.com>
Date: Thu, 2 Aug 2018 23:20:38 -0700
> All the callers of ip6_rt_copy_init()/rt6_set_from() hold refcnt
> of the "from" fib6_info, so there is no need to hold fib6_metrics
> refcnt again, because fib6_metrics refcnt is only released when
> fib6_info is gone, that is, they have the same life time, so the
> whole fib6_metrics refcnt can be removed actually.
>
> This fixes a kmemleak warning reported by Sabrina.
>
> Fixes: 93531c674315 ("net/ipv6: separate handling of FIB entries from dst based routes")
> Reported-by: Sabrina Dubroca <sd@queasysnail.net>
> Cc: Sabrina Dubroca <sd@queasysnail.net>
> Cc: David Ahern <dsahern@gmail.com>
> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Sabrina, please review!
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Patch net] ipv6: fix double refcount of fib6_metrics
2018-08-03 6:20 [Patch net] ipv6: fix double refcount of fib6_metrics Cong Wang
2018-08-03 19:38 ` David Miller
@ 2018-08-06 0:23 ` David Miller
2018-08-12 23:08 ` David Ahern
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2018-08-06 0:23 UTC (permalink / raw)
To: xiyou.wangcong; +Cc: netdev, sd, dsahern
From: Cong Wang <xiyou.wangcong@gmail.com>
Date: Thu, 2 Aug 2018 23:20:38 -0700
> All the callers of ip6_rt_copy_init()/rt6_set_from() hold refcnt
> of the "from" fib6_info, so there is no need to hold fib6_metrics
> refcnt again, because fib6_metrics refcnt is only released when
> fib6_info is gone, that is, they have the same life time, so the
> whole fib6_metrics refcnt can be removed actually.
>
> This fixes a kmemleak warning reported by Sabrina.
>
> Fixes: 93531c674315 ("net/ipv6: separate handling of FIB entries from dst based routes")
> Reported-by: Sabrina Dubroca <sd@queasysnail.net>
> Cc: Sabrina Dubroca <sd@queasysnail.net>
> Cc: David Ahern <dsahern@gmail.com>
> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Applied, thanks Cong.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Patch net] ipv6: fix double refcount of fib6_metrics
2018-08-03 6:20 [Patch net] ipv6: fix double refcount of fib6_metrics Cong Wang
2018-08-03 19:38 ` David Miller
2018-08-06 0:23 ` David Miller
@ 2018-08-12 23:08 ` David Ahern
2 siblings, 0 replies; 4+ messages in thread
From: David Ahern @ 2018-08-12 23:08 UTC (permalink / raw)
To: Cong Wang, netdev; +Cc: Sabrina Dubroca
On 8/3/18 12:20 AM, Cong Wang wrote:
> All the callers of ip6_rt_copy_init()/rt6_set_from() hold refcnt
> of the "from" fib6_info, so there is no need to hold fib6_metrics
> refcnt again, because fib6_metrics refcnt is only released when
> fib6_info is gone, that is, they have the same life time, so the
> whole fib6_metrics refcnt can be removed actually.
>
> This fixes a kmemleak warning reported by Sabrina.
>
> Fixes: 93531c674315 ("net/ipv6: separate handling of FIB entries from dst based routes")
> Reported-by: Sabrina Dubroca <sd@queasysnail.net>
> Cc: Sabrina Dubroca <sd@queasysnail.net>
> Cc: David Ahern <dsahern@gmail.com>
> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
> ---
> net/ipv6/route.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/net/ipv6/route.c b/net/ipv6/route.c
> index ec18b3ce8b6d..7208c16302f6 100644
> --- a/net/ipv6/route.c
> +++ b/net/ipv6/route.c
> @@ -978,10 +978,6 @@ static void rt6_set_from(struct rt6_info *rt, struct fib6_info *from)
> rt->rt6i_flags &= ~RTF_EXPIRES;
> rcu_assign_pointer(rt->from, from);
> dst_init_metrics(&rt->dst, from->fib6_metrics->metrics, true);
> - if (from->fib6_metrics != &dst_default_metrics) {
> - rt->dst._metrics |= DST_METRICS_REFCOUNTED;
> - refcount_inc(&from->fib6_metrics->refcnt);
> - }
> }
>
> /* Caller must already hold reference to @ort */
>
This seems like a reasonable fix. Thanks for the patch.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-08-13 1:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-03 6:20 [Patch net] ipv6: fix double refcount of fib6_metrics Cong Wang
2018-08-03 19:38 ` David Miller
2018-08-06 0:23 ` David Miller
2018-08-12 23:08 ` David Ahern
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.