diff options
| author | Gao feng <omarapazanadi@gmail.com> | 2015-10-18 23:35:56 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-21 07:41:06 -0700 |
| commit | f6a835bb04ca34b6fd337eea0544a871ba2349b8 (patch) | |
| tree | 7c654f8760174bcd131acf5f1156c03b4ff36a61 /net/vmw_vsock | |
| parent | 10be15ff6c33f1dc0a96cae6089dc2268834e568 (diff) | |
| download | linux-f6a835bb04ca34b6fd337eea0544a871ba2349b8.tar.gz linux-f6a835bb04ca34b6fd337eea0544a871ba2349b8.tar.xz | |
vsock: fix missing cleanup when misc_register failed
reset transport and unlock if misc_register failed.
Signed-off-by: Gao feng <omarapazanadi@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/vmw_vsock')
| -rw-r--r-- | net/vmw_vsock/af_vsock.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index df5fc6b340f1..00e8a349aabc 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -1948,13 +1948,13 @@ int __vsock_core_init(const struct vsock_transport *t, struct module *owner) err = misc_register(&vsock_device); if (err) { pr_err("Failed to register misc device\n"); - return -ENOENT; + goto err_reset_transport; } err = proto_register(&vsock_proto, 1); /* we want our slab */ if (err) { pr_err("Cannot register vsock protocol\n"); - goto err_misc_deregister; + goto err_deregister_misc; } err = sock_register(&vsock_family_ops); @@ -1969,8 +1969,9 @@ int __vsock_core_init(const struct vsock_transport *t, struct module *owner) err_unregister_proto: proto_unregister(&vsock_proto); -err_misc_deregister: +err_deregister_misc: misc_deregister(&vsock_device); +err_reset_transport: transport = NULL; err_busy: mutex_unlock(&vsock_register_mutex); |