---

yaml --- r: 290798 b: refs/heads/master c: b4fb05e h: refs/heads/master v: v3
git-mirror · Mar 7, 2012 · f665b0c · f665b0c
1 parent d69bade
commit f665b0c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae5d33723e325392c48bc0ff481d9ec8d646a0ed
+refs/heads/master: b4fb05ea402cb6930b40d3152d8acabc391b23e2
diff --git a/trunk/net/ipv4/tcp_ipv4.c b/trunk/net/ipv4/tcp_ipv4.c
@@ -927,7 +927,8 @@ struct tcp_md5sig_key *tcp_md5_do_lookup(struct sock *sk,
 
 	/* caller either holds rcu_read_lock() or socket lock */
 	md5sig = rcu_dereference_check(tp->md5sig_info,
-				       sock_owned_by_user(sk));
+				       sock_owned_by_user(sk) ||
+				       lockdep_is_held(&sk->sk_lock.slock));
 	if (!md5sig)
 		return NULL;
 #if IS_ENABLED(CONFIG_IPV6)