---

yaml --- r: 290822 b: refs/heads/master c: c75a312 h: refs/heads/master v: v3
git-mirror · Mar 8, 2012 · cfcdab5 · cfcdab5
1 parent fbab97f
commit cfcdab5
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: ace30d73ef09fd5f95b24c5c1c5aa11963981494
+refs/heads/master: c75a312d8b2c97943014261d71c6ef2622b6d0d9
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)