Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e70a3aad authored by Cong Wang's avatar Cong Wang Committed by David S. Miller
Browse files

ipv6: fix double refcount of fib6_metrics 



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: 93531c67 ("net/ipv6: separate handling of FIB entries from dst based routes")
Reported-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Cc: Sabrina Dubroca <sd@queasysnail.net>
Cc: David Ahern <dsahern@gmail.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ffaddd0

net/ipv6/route.c

+0 −4
Original line number Diff line number Diff line
@@ -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 */