Commit 82486aa6 authored by WANG Cong's avatar WANG Cong Committed by David S. Miller

ipv4: restore rt->fi for reference counting

IPv4 dst could use fi->fib_metrics to store metrics but fib_info
itself is refcnt'ed, so without taking a refcnt fi and
fi->fib_metrics could be freed while dst metrics still points to
it. This triggers use-after-free as reported by Andrey twice.

This patch reverts commit 2860583f ("ipv4: Kill rt->fi") to
restore this reference counting. It is a quick fix for -net and
-stable, for -net-next, as Eric suggested, we can consider doing
reference counting for metrics itself instead of relying on fib_info.

IPv6 is very different, it copies or steals the metrics from mx6_config
in fib6_commit_metrics() so probably doesn't need a refcnt.

Decnet has already done the refcnt'ing, see dn_fib_semantic_match().

Fixes: 2860583f ("ipv4: Kill rt->fi")
Reported-by: 's avatarAndrey Konovalov <>
Tested-by: 's avatarAndrey Konovalov <>
Signed-off-by: 's avatarCong Wang <>
Acked-by: 's avatarEric Dumazet <>
Signed-off-by: 's avatarDavid S. Miller <>
parent 3013c498
......@@ -69,6 +69,7 @@ struct rtable {
struct list_head rt_uncached;
struct uncached_list *rt_uncached_list;
struct fib_info *fi; /* for refcnt to shared metrics */
static inline bool rt_is_input_route(const struct rtable *rt)
......@@ -1387,6 +1387,11 @@ static void ipv4_dst_destroy(struct dst_entry *dst)
struct rtable *rt = (struct rtable *) dst;
if (rt->fi) {
rt->fi = NULL;
if (!list_empty(&rt->rt_uncached)) {
struct uncached_list *ul = rt->rt_uncached_list;
......@@ -1424,6 +1429,16 @@ static bool rt_cache_valid(const struct rtable *rt)
static void rt_init_metrics(struct rtable *rt, struct fib_info *fi)
if (fi->fib_metrics != (u32 *)dst_default_metrics) {
rt->fi = fi;
dst_init_metrics(&rt->dst, fi->fib_metrics, true);
static void rt_set_nexthop(struct rtable *rt, __be32 daddr,
const struct fib_result *res,
struct fib_nh_exception *fnhe,
......@@ -1438,7 +1453,7 @@ static void rt_set_nexthop(struct rtable *rt, __be32 daddr,
rt->rt_gateway = nh->nh_gw;
rt->rt_uses_gateway = 1;
dst_init_metrics(&rt->dst, fi->fib_metrics, true);
rt_init_metrics(rt, fi);
rt->dst.tclassid = nh->nh_tclassid;
......@@ -1490,6 +1505,7 @@ struct rtable *rt_dst_alloc(struct net_device *dev,
rt->rt_gateway = 0;
rt->rt_uses_gateway = 0;
rt->rt_table_id = 0;
rt->fi = NULL;
rt->dst.output = ip_output;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment