As suggested by Eric, we could introduce a helper function
for ipv6 too, to avoid checking if rt is NULL before
dst_release().
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
+static inline void ip6_rt_put(struct rt6_info *rt)
+{
+ /* dst_release() accepts a NULL parameter.
+ * We rely on dst being first structure in struct rt6_info
+ */
+ BUILD_BUG_ON(offsetof(struct rt6_info, dst) != 0);
+ dst_release(&rt->dst);
+}
+
struct fib6_walker_t {
struct list_head lh;
struct fib6_node *root, *node;
struct fib6_walker_t {
struct list_head lh;
struct fib6_node *root, *node;
pr_warn("Freeing alive inet6 address %p\n", ifp);
return;
}
pr_warn("Freeing alive inet6 address %p\n", ifp);
return;
}
- dst_release(&ifp->rt->dst);
rt6_set_expires(rt, expires);
}
}
rt6_set_expires(rt, expires);
}
}
}
/* clean up prefsrc entries */
}
/* clean up prefsrc entries */
addrconf_prefix_route(&pinfo->prefix, pinfo->prefix_len,
dev, expires, flags);
}
addrconf_prefix_route(&pinfo->prefix, pinfo->prefix_len,
dev, expires, flags);
}
- if (rt)
- dst_release(&rt->dst);
}
/* Try to figure out our local address for this prefix */
}
/* Try to figure out our local address for this prefix */
rt = rt6_lookup(net, addr, NULL, 0, 0);
if (rt) {
dev = rt->dst.dev;
rt = rt6_lookup(net, addr, NULL, 0, 0);
if (rt) {
dev = rt->dst.dev;
} else if (ishost) {
err = -EADDRNOTAVAIL;
goto error;
} else if (ishost) {
err = -EADDRNOTAVAIL;
goto error;
dev->mtu = IPV6_MIN_MTU;
}
}
dev->mtu = IPV6_MIN_MTU;
}
}
if (err == 0) {
IP6_INC_STATS(net, ip6_dst_idev(&rt->dst),
IPSTATS_MIB_FRAGOKS);
if (err == 0) {
IP6_INC_STATS(net, ip6_dst_idev(&rt->dst),
IPSTATS_MIB_FRAGOKS);
IP6_INC_STATS(net, ip6_dst_idev(&rt->dst),
IPSTATS_MIB_FRAGFAILS);
IP6_INC_STATS(net, ip6_dst_idev(&rt->dst),
IPSTATS_MIB_FRAGFAILS);
return err;
slow_path_clean:
return err;
slow_path_clean:
icmpv6_send(skb2, rel_type, rel_code, rel_info);
icmpv6_send(skb2, rel_type, rel_code, rel_info);
- if (rt)
- dst_release(&rt->dst);
if (dev->mtu < IPV6_MIN_MTU)
dev->mtu = IPV6_MIN_MTU;
}
if (dev->mtu < IPV6_MIN_MTU)
dev->mtu = IPV6_MIN_MTU;
}
rt = rt6_lookup(net, addr, NULL, 0, 0);
if (rt) {
dev = rt->dst.dev;
rt = rt6_lookup(net, addr, NULL, 0, 0);
if (rt) {
dev = rt->dst.dev;
}
} else
dev = dev_get_by_index_rcu(net, ifindex);
}
} else
dev = dev_get_by_index_rcu(net, ifindex);
if (rt) {
dev = rt->dst.dev;
if (rt) {
dev = rt->dst.dev;
}
} else
dev = dev_get_by_index_rcu(net, ifindex);
}
} else
dev = dev_get_by_index_rcu(net, ifindex);
ND_PRINTK(0, err,
"RA: %s got default router without neighbour\n",
__func__);
ND_PRINTK(0, err,
"RA: %s got default router without neighbour\n",
__func__);
ND_PRINTK(0, err,
"RA: %s got default router without neighbour\n",
__func__);
ND_PRINTK(0, err,
"RA: %s got default router without neighbour\n",
__func__);
return;
}
neigh->flags |= NTF_ROUTER;
return;
}
neigh->flags |= NTF_ROUTER;
ND_PRINTK(2, warn, "RA: invalid RA options\n");
}
out:
ND_PRINTK(2, warn, "RA: invalid RA options\n");
}
out:
- if (rt)
- dst_release(&rt->dst);
if (neigh)
neigh_release(neigh);
}
if (neigh)
neigh_release(neigh);
}
if (rt->rt6i_idev->dev == dev || (flags & XT_RPFILTER_LOOSE))
ret = true;
out:
if (rt->rt6i_idev->dev == dev || (flags & XT_RPFILTER_LOOSE))
ret = true;
out:
else
rt6_set_expires(rt, jiffies + HZ * lifetime);
else
rt6_set_expires(rt, jiffies + HZ * lifetime);
rt = nrt ? : net->ipv6.ip6_null_entry;
dst_hold(&rt->dst);
rt = nrt ? : net->ipv6.ip6_null_entry;
dst_hold(&rt->dst);
* Race condition! In the gap, when table->tb6_lock was
* released someone could insert this route. Relookup.
*/
* Race condition! In the gap, when table->tb6_lock was
* released someone could insert this route. Relookup.
*/
goto out;
if (dev) {
if (dev != grt->dst.dev) {
goto out;
if (dev) {
if (dev != grt->dst.dev) {
- dst_release(&grt->dst);
}
if (!(grt->rt6i_flags & RTF_GATEWAY))
err = 0;
}
if (!(grt->rt6i_flags & RTF_GATEWAY))
err = 0;
- dst_release(&grt->dst);
write_unlock_bh(&table->tb6_lock);
out:
write_unlock_bh(&table->tb6_lock);
out:
skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
if (!skb) {
skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
if (!skb) {
err = -ENOBUFS;
goto errout;
}
err = -ENOBUFS;
goto errout;
}