diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-11-13 01:54:48 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-11-13 01:54:48 +0100 |
| commit | e1d9d7b91302593d1951fcb12feddda6fb58a3c0 (patch) | |
| tree | 25662dfcceb84414d66f6c90714883b1542c0ea5 /net/tipc/topsrv.c | |
| parent | selftests: set conf.all.rp_filter=0 in bareudp.sh (diff) | |
| parent | Merge tag 'net-5.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | linux-e1d9d7b91302593d1951fcb12feddda6fb58a3c0.tar.xz linux-e1d9d7b91302593d1951fcb12feddda6fb58a3c0.zip | |
Merge https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/tipc/topsrv.c')
| -rw-r--r-- | net/tipc/topsrv.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/net/tipc/topsrv.c b/net/tipc/topsrv.c index cec029349662..88ad39e47a98 100644 --- a/net/tipc/topsrv.c +++ b/net/tipc/topsrv.c @@ -664,12 +664,18 @@ static int tipc_topsrv_start(struct net *net) ret = tipc_topsrv_work_start(srv); if (ret < 0) - return ret; + goto err_start; ret = tipc_topsrv_create_listener(srv); if (ret < 0) - tipc_topsrv_work_stop(srv); + goto err_create; + return 0; + +err_create: + tipc_topsrv_work_stop(srv); +err_start: + kfree(srv); return ret; } |