---

yaml
---
r: 58239
b: refs/heads/master
c: f50f95c
h: refs/heads/master
i:
  58237: 2a38fd1
  58235: 7356e83
  58231: eda5ae2
  58223: 3b3e2bb
  58207: 4c7f916
  58175: a2af70c
  58111: aeda7c6
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3663c306609a9322a484fba28b3da66142c50ee9
+refs/heads/master: f50f95cab735ebe2993e8d1549f0615bad05f3f2

trunk/net/sctp/socket.c

@@ -980,6 +980,7 @@ static int __sctp_connect(struct sock* sk,
 	union sctp_addr *sa_addr;
 	void *addr_buf;
 	unsigned short port;
+	unsigned int f_flags = 0;
 
 	sp = sctp_sk(sk);
 	ep = sp->ep;
@@ -1106,7 +1107,14 @@ static int __sctp_connect(struct sock* sk,
 	af->to_sk_daddr(&to, sk);
 	sk->sk_err = 0;
 
-	timeo = sock_sndtimeo(sk, sk->sk_socket->file->f_flags & O_NONBLOCK);
+	/* in-kernel sockets don't generally have a file allocated to them
+	 * if all they do is call sock_create_kern().
+	 */
+	if (sk->sk_socket->file)
+		f_flags = sk->sk_socket->file->f_flags;
+
+	timeo = sock_sndtimeo(sk, f_flags & O_NONBLOCK);
+
 	err = sctp_wait_for_connect(asoc, &timeo);
 
 	/* Don't free association on exit. */