Merge tag 'dm-4.2-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device...

[karo-tx-linux.git] / net / tipc / server.c

diff --git a/net/tipc/server.c b/net/tipc/server.c
index 77ff03ed1e18d13224f086c2315d7123cc931123..922e04a43396db1f19fa6f1721a29840fb9b45d8 100644 (file)
--- a/net/tipc/server.c
+++ b/net/tipc/server.c
@@ -309,6 +309,10 @@ static int tipc_accept_from_sock(struct tipc_conn *con)
 
        /* Notify that new connection is incoming */
        newcon->usr_data = s->tipc_conn_new(newcon->conid);
+       if (!newcon->usr_data) {
+               sock_release(newsock);
+               return -ENOMEM;
+       }
 
        /* Wake up receive process in case of 'SYN+' message */
        newsock->sk->sk_data_ready(newsock->sk);
@@ -321,7 +325,7 @@ static struct socket *tipc_create_listen_sock(struct tipc_conn *con)
        struct socket *sock = NULL;
        int ret;
 
-       ret = __sock_create(s->net, AF_TIPC, SOCK_SEQPACKET, 0, &sock, 1);
+       ret = sock_create_kern(s->net, AF_TIPC, SOCK_SEQPACKET, 0, &sock);
        if (ret < 0)
                return NULL;
        ret = kernel_setsockopt(sock, SOL_TIPC, TIPC_IMPORTANCE,