Skip to content

Commit

Permalink
ipv6: release reference of ip6_null_entry's dst entry in __ip6_del_rt
Browse files Browse the repository at this point in the history
as we hold dst_entry before we call __ip6_del_rt,
so we should alse call dst_release not only return
-ENOENT when the rt6_info is ip6_null_entry.

and we already hold the dst entry, so I think it's
safe to call dst_release out of the write-read lock.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Gao feng authored and David S. Miller committed Oct 4, 2012
1 parent 32418cf commit 6825a26
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions net/ipv6/route.c
Original file line number Diff line number Diff line change
Expand Up @@ -1593,17 +1593,18 @@ static int __ip6_del_rt(struct rt6_info *rt, struct nl_info *info)
struct fib6_table *table;
struct net *net = dev_net(rt->dst.dev);

if (rt == net->ipv6.ip6_null_entry)
return -ENOENT;
if (rt == net->ipv6.ip6_null_entry) {
err = -ENOENT;
goto out;
}

table = rt->rt6i_table;
write_lock_bh(&table->tb6_lock);

err = fib6_del(rt, info);
dst_release(&rt->dst);

write_unlock_bh(&table->tb6_lock);

out:
dst_release(&rt->dst);
return err;
}

Expand Down

0 comments on commit 6825a26

Please sign in to comment.