ipv6: have a single rcu unlock point in __ip6_rt_update_pmtu (43a4b60d) · Commits · 戴 / test

net/ipv6/route.c

+6 −8

Original line number	Diff line number	Diff line
		@@ -2725,10 +2725,9 @@ static void __ip6_rt_update_pmtu(struct dst_entry dst, const struct sock sk,

		rcu_read_lock();
		res.f6i = rcu_dereference(rt6->from);
		if (!res.f6i) {
		rcu_read_unlock();
		return;
		}
		if (!res.f6i)
		goto out_unlock;

		res.fib6_flags = res.f6i->fib6_flags;
		res.fib6_type = res.f6i->fib6_type;

		@@ -2744,10 +2743,8 @@ static void __ip6_rt_update_pmtu(struct dst_entry dst, const struct sock sk,
		/* fib6_info uses a nexthop that does not have fib6_nh
		* using the dst->dev + gw. Should be impossible.
		*/
		if (!arg.match) {
		rcu_read_unlock();
		return;
		}
		if (!arg.match)
		goto out_unlock;

		res.nh = arg.match;
		} else {
		@@ -2760,6 +2757,7 @@ static void __ip6_rt_update_pmtu(struct dst_entry dst, const struct sock sk,
		if (rt6_insert_exception(nrt6, &res))
		dst_release_immediate(&nrt6->dst);
		}
		out_unlock:
		rcu_read_unlock();
		}
		}