From: Eric Dumazet <edumazet@google.com>
Date: Mon, 6 Mar 2017 19:23:55 +0000 (-0800)
Subject: net: use proper lockdep annotation in __sk_dst_set()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=95964c6de787eb21468a29b94e9d25e1a24d6a37;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

net: use proper lockdep annotation in __sk_dst_set()

__sk_dst_set() must be called while we own the socket.

We can get proper lockdep coverage using lockdep_sock_is_held()
and rcu_dereference_protected()

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/net/sock.h b/include/net/sock.h
index 5e5997654db6..6db7693b9e61 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1780,11 +1780,8 @@ __sk_dst_set(struct sock *sk, struct dst_entry *dst)
 
 	sk_tx_queue_clear(sk);
 	sk->sk_dst_pending_confirm = 0;
-	/*
-	 * This can be called while sk is owned by the caller only,
-	 * with no state that can be checked in a rcu_dereference_check() cond
-	 */
-	old_dst = rcu_dereference_raw(sk->sk_dst_cache);
+	old_dst = rcu_dereference_protected(sk->sk_dst_cache,
+					    lockdep_sock_is_held(sk));
 	rcu_assign_pointer(sk->sk_dst_cache, dst);
 	dst_release(old_dst);
 }