netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Ahern <dsahern@gmail.com>
To: Cong Wang <xiyou.wangcong@gmail.com>, netdev@vger.kernel.org
Cc: Sabrina Dubroca <sd@queasysnail.net>
Subject: Re: [Patch net] ipv6: fix double refcount of fib6_metrics
Date: Sun, 12 Aug 2018 17:08:59 -0600	[thread overview]
Message-ID: <30bcd6d8-e1ec-2cc3-8b2f-8a21ad4a529a@gmail.com> (raw)
In-Reply-To: <20180803062038.13272-1-xiyou.wangcong@gmail.com>

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.

      parent reply	other threads:[~2018-08-13  1:48 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=30bcd6d8-e1ec-2cc3-8b2f-8a21ad4a529a@gmail.com \
    --to=dsahern@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=sd@queasysnail.net \
    --cc=xiyou.wangcong@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).