---

yaml --- r: 58106 b: refs/heads/master c: 5131a18 h: refs/heads/master v: v3
git-mirror · Jun 26, 2007 · 50820cb · 50820cb
1 parent c971780
commit 50820cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 186e234358ba29a4094d0c8c0d3ea00f84d32a3e
+refs/heads/master: 5131a184a3458d9ac47d9eba032cf4c4d3295afd
diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c
@@ -6123,8 +6123,11 @@ static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,
 	 * queued to the backlog.  This prevents a potential race between
 	 * backlog processing on the old socket and new-packet processing
 	 * on the new socket.
+	 *
+	 * The caller has just allocated newsk so we can guarantee that other
+	 * paths won't try to lock it and then oldsk.
 	 */
-	sctp_lock_sock(newsk);
+	lock_sock_nested(newsk, SINGLE_DEPTH_NESTING);
 	sctp_assoc_migrate(assoc, newsk);
 
 	/* If the association on the newsk is already closed before accept()