diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2013-08-09 05:30:39 +0200 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2013-08-09 05:30:39 +0200 |
| commit | 11489736177c5930514482b4db7af862d945335d (patch) | |
| tree | 8590ec4ba037b79c94982e15922fe50a1f0193a3 /net/tipc/server.c | |
| parent | virtio: console: cleanup an error message (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egt... (diff) | |
| download | linux-11489736177c5930514482b4db7af862d945335d.tar.xz linux-11489736177c5930514482b4db7af862d945335d.zip | |
Merge branch 'master' into virtio-next
The next commit gets conflicts because it relies on patches which were
cc:stable and thus had to be merged into Linus' tree before the coming
merge window. So pull in master now.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'net/tipc/server.c')
| -rw-r--r-- | net/tipc/server.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/net/tipc/server.c b/net/tipc/server.c index 19da5abe0fa6..fd3fa57a410e 100644 --- a/net/tipc/server.c +++ b/net/tipc/server.c @@ -355,8 +355,12 @@ static int tipc_open_listening_sock(struct tipc_server *s) return PTR_ERR(con); sock = tipc_create_listen_sock(con); - if (!sock) + if (!sock) { + idr_remove(&s->conn_idr, con->conid); + s->idr_in_use--; + kfree(con); return -EINVAL; + } tipc_register_callbacks(sock, con); return 0; @@ -563,9 +567,14 @@ int tipc_server_start(struct tipc_server *s) kmem_cache_destroy(s->rcvbuf_cache); return ret; } + ret = tipc_open_listening_sock(s); + if (ret < 0) { + tipc_work_stop(s); + kmem_cache_destroy(s->rcvbuf_cache); + return ret; + } s->enabled = 1; - - return tipc_open_listening_sock(s); + return ret; } void tipc_server_stop(struct tipc_server *s) |