aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorVlad Yasevich <vladislav.yasevich@hp.com>2007-07-03 12:47:40 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-07-05 20:40:11 -0400
commitf50f95cab735ebe2993e8d1549f0615bad05f3f2 (patch)
tree4cbb7f7df0c50c35554a0cbfd58413894bae72c8 /net
parent3663c306609a9322a484fba28b3da66142c50ee9 (diff)
SCTP: Check to make sure file is valid before setting timeout
In-kernel sockets created with sock_create_kern don't usually have a file and file descriptor allocated to them. As a result, when SCTP tries to check the non-blocking flag, we Oops when dereferencing a NULL file pointer. Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/sctp/socket.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 1e788279bb22..b1917f68723c 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -980,6 +980,7 @@ static int __sctp_connect(struct sock* sk,
980 union sctp_addr *sa_addr; 980 union sctp_addr *sa_addr;
981 void *addr_buf; 981 void *addr_buf;
982 unsigned short port; 982 unsigned short port;
983 unsigned int f_flags = 0;
983 984
984 sp = sctp_sk(sk); 985 sp = sctp_sk(sk);
985 ep = sp->ep; 986 ep = sp->ep;
@@ -1106,7 +1107,14 @@ static int __sctp_connect(struct sock* sk,
1106 af->to_sk_daddr(&to, sk); 1107 af->to_sk_daddr(&to, sk);
1107 sk->sk_err = 0; 1108 sk->sk_err = 0;
1108 1109
1109 timeo = sock_sndtimeo(sk, sk->sk_socket->file->f_flags & O_NONBLOCK); 1110 /* in-kernel sockets don't generally have a file allocated to them
1111 * if all they do is call sock_create_kern().
1112 */
1113 if (sk->sk_socket->file)
1114 f_flags = sk->sk_socket->file->f_flags;
1115
1116 timeo = sock_sndtimeo(sk, f_flags & O_NONBLOCK);
1117
1110 err = sctp_wait_for_connect(asoc, &timeo); 1118 err = sctp_wait_for_connect(asoc, &timeo);
1111 1119
1112 /* Don't free association on exit. */ 1120 /* Don't free association on exit. */