From d2255b5175a737b35c745fc0864e6cdc1c62d252 Mon Sep 17 00:00:00 2001
From: Daniel Borkmann <dborkman@redhat.com>
Date: Thu, 6 Jun 2013 15:53:47 +0200
Subject: [PATCH] --- yaml --- r: 377015 b: refs/heads/master c:
 1abd165ed757db1afdefaac0a4bc8a70f97d258c h: refs/heads/master i:   377013:
 b8e3537772b780c28475e49275aff04bcb973e5c   377011:
 21da4da23c0459a0a131da8b8420fc65db36e538   377007:
 8395ea57b3e46daa0332826c0fd0f9924cc87e6d v: v3

---
 [refs]                  | 2 +-
 trunk/net/sctp/socket.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e0ea2908ba21..8f57ae3ce168 100644
--- 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
index f631c5ff4dbf..6abb1caf9836 100644
--- 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);