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

Commit fb9de91e authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

[IPV6]: ROUTE: Clean up reference counting / unlocking for returning object. 



Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d5315b50

net/ipv6/route.c

+15 −14
Original line number Diff line number Diff line
@@ -478,7 +478,6 @@ static struct rt6_info *rt6_alloc_clone(struct rt6_info *ort, struct in6_addr *d 
if (rt == &ip6_null_entry && strict) { \

       while ((fn = fn->parent) != NULL) { \

		if (fn->fn_flags & RTN_ROOT) { \

			dst_hold(&rt->u.dst); \

			goto out; \

		} \

		if (fn->fn_flags & RTN_RTINFO) \
@@ -508,18 +507,18 @@ void ip6_route_input(struct sk_buff *skb) 
	if ((rt->rt6i_flags & RTF_CACHE)) {

		rt = rt6_device_match(rt, skb->dev->ifindex, strict);

		BACKTRACK();

		dst_hold(&rt->u.dst);

		goto out;

	}



	rt = rt6_device_match(rt, skb->dev->ifindex, strict);

	BACKTRACK();



	if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP)) {

		struct rt6_info *nrt;

	dst_hold(&rt->u.dst);

	read_unlock_bh(&rt6_lock);



	if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP)) {

		struct rt6_info *nrt;



		nrt = rt6_cow(rt, &skb->nh.ipv6h->daddr,

			      &skb->nh.ipv6h->saddr,

			      &NETLINK_CB(skb));
@@ -536,14 +535,16 @@ void ip6_route_input(struct sk_buff *skb) 
		dst_release(&rt->u.dst);

		goto relookup;

	}

	dst_hold(&rt->u.dst);



out:

	read_unlock_bh(&rt6_lock);

out2:

	rt->u.dst.lastuse = jiffies;

	rt->u.dst.__use++;

	skb->dst = (struct dst_entry *) rt;

	return;

out:

	dst_hold(&rt->u.dst);

	read_unlock_bh(&rt6_lock);

	goto out2;

}



struct dst_entry * ip6_route_output(struct sock *sk, struct flowi *fl)
@@ -566,7 +567,6 @@ struct dst_entry * ip6_route_output(struct sock *sk, struct flowi *fl) 
	if ((rt->rt6i_flags & RTF_CACHE)) {

		rt = rt6_device_match(rt, fl->oif, strict);

		BACKTRACK();

		dst_hold(&rt->u.dst);

		goto out;

	}

	if (rt->rt6i_flags & RTF_DEFAULT) {
@@ -577,11 +577,12 @@ struct dst_entry * ip6_route_output(struct sock *sk, struct flowi *fl) 
		BACKTRACK();

	}



	if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP)) {

		struct rt6_info *nrt;

	dst_hold(&rt->u.dst);

	read_unlock_bh(&rt6_lock);



	if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP)) {

		struct rt6_info *nrt;



		nrt = rt6_cow(rt, &fl->fl6_dst, &fl->fl6_src, NULL);



		dst_release(&rt->u.dst);
@@ -596,14 +597,14 @@ struct dst_entry * ip6_route_output(struct sock *sk, struct flowi *fl) 
		dst_release(&rt->u.dst);

		goto relookup;

	}

	dst_hold(&rt->u.dst);



out:

	read_unlock_bh(&rt6_lock);

out2:

	rt->u.dst.lastuse = jiffies;

	rt->u.dst.__use++;

	return &rt->u.dst;

out:

	dst_hold(&rt->u.dst);

	read_unlock_bh(&rt6_lock);

	goto out2;

}