---

yaml --- r: 377015 b: refs/heads/master c: 1abd165 h: refs/heads/master i: 377013: b8e3537 377011: 21da4da 377007: 8395ea5 v: v3
git-mirror · Jun 11, 2013 · d2255b5 · d2255b5
1 parent 1a26bf0
commit d2255b5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 288cfe78c8173f35c7a94f06859f60b3693d828a
+refs/heads/master: 1abd165ed757db1afdefaac0a4bc8a70f97d258c
diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c
@@ -4003,6 +4003,12 @@ SCTP_STATIC void sctp_destroy_sock(struct sock *sk)
 
 	/* Release our hold on the endpoint. */
 	sp = sctp_sk(sk);
+	/* This could happen during socket init, thus we bail out
+	 * early, since the rest of the below is not setup either.
+	 */
+	if (sp->ep == NULL)
+		return;
+
 	if (sp->do_auto_asconf) {
 		sp->do_auto_asconf = 0;
 		list_del(&sp->auto_asconf_list);