Merge "udp: call dst_hold_safe() in udp_sk_rx_set_dst()" (f730ee37) · Commits · e / devices / android_kernel_fairphone_FP3

net/ipv4/udp.c

+9 −10

Original line number	Diff line number	Diff line
		@@ -1631,10 +1631,11 @@ void udp_sk_rx_dst_set(struct sock sk, struct dst_entry dst)
		{
		struct dst_entry *old;

		dst_hold(dst);
		if (dst_hold_safe(dst)) {
		old = xchg(&sk->sk_rx_dst, dst);
		dst_release(old);
		}
		}
		EXPORT_SYMBOL(udp_sk_rx_dst_set);

		/*
		@@ -1958,15 +1959,13 @@ void udp_v4_early_demux(struct sk_buff *skb)
		if (dst)
		dst = dst_check(dst, 0);
		if (dst) {
		/* DST_NOCACHE can not be used without taking a reference */
		if (dst->flags & DST_NOCACHE) {
		if (likely(atomic_inc_not_zero(&dst->__refcnt)))
		skb_dst_set(skb, dst);
		} else {
		/* set noref for now.
		* any place which wants to hold dst has to call
		* dst_hold_safe()
		*/
		skb_dst_set_noref(skb, dst);
		}
		}
		}

		int udp_rcv(struct sk_buff *skb)
		{

+5 −6

Original line number	Diff line number	Diff line
		@@ -933,14 +933,13 @@ static void udp_v6_early_demux(struct sk_buff *skb)
		if (dst)
		dst = dst_check(dst, inet6_sk(sk)->rx_dst_cookie);
		if (dst) {
		if (dst->flags & DST_NOCACHE) {
		if (likely(atomic_inc_not_zero(&dst->__refcnt)))
		skb_dst_set(skb, dst);
		} else {
		/* set noref for now.
		* any place which wants to hold dst has to call
		* dst_hold_safe()
		*/
		skb_dst_set_noref(skb, dst);
		}
		}
		}

		static __inline__ int udpv6_rcv(struct sk_buff *skb)
		{