luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vsock: Make transport the proto owner

Browse Source 
Right now the core vsock module is the owner of the proto family. This
means there's nothing preventing the transport module from unloading if
there are open sockets, which results in a panic. Fix that by allowing
the transport to be the owner, which will refcount it properly.

Includes version bump to 1.0.1.0-k

Passes checkpatch this time, I swear...

Acked-by: Dmitry Torokhov <dtor@vmware.com>
Signed-off-by: Andy King <acking@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andy King 2014-05-01 15:20:43 -07:00 committed by David S. Miller
parent b8dff4e60c
commit 2c4a336e0a
2 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/net/af_vsock.h
View File

@ -155,7 +155,11 @@ struct vsock_transport {
/**** CORE ****/
int vsock_core_init(const struct vsock_transport *t);
int __vsock_core_init(const struct vsock_transport *t, struct module *owner);
static inline int vsock_core_init(const struct vsock_transport *t)
{
return __vsock_core_init(t, THIS_MODULE);
}
void vsock_core_exit(void);
/**** UTILS ****/

47
net/vmw_vsock/af_vsock.c
View File

@ -1925,9 +1925,23 @@ static struct miscdevice vsock_device = {
.fops = &vsock_device_ops,
};
static int __vsock_core_init(void)
int __vsock_core_init(const struct vsock_transport *t, struct module *owner)
{
int err;
int err = mutex_lock_interruptible(&vsock_register_mutex);
if (err)
return err;
if (transport) {
err = -EBUSY;
goto err_busy;
}
/* Transport must be the owner of the protocol so that it can't
* unload while there are open sockets.
*/
vsock_proto.owner = owner;
transport = t;
vsock_init_tables();
@ -1951,36 +1965,19 @@ static int __vsock_core_init(void)
goto err_unregister_proto;
}
mutex_unlock(&vsock_register_mutex);
return 0;
err_unregister_proto:
proto_unregister(&vsock_proto);
err_misc_deregister:
misc_deregister(&vsock_device);
transport = NULL;
err_busy:
mutex_unlock(&vsock_register_mutex);
return err;
}
int vsock_core_init(const struct vsock_transport *t)
{
int retval = mutex_lock_interruptible(&vsock_register_mutex);
if (retval)
return retval;
if (transport) {
retval = -EBUSY;
goto out;
}
transport = t;
retval = __vsock_core_init();
if (retval)
transport = NULL;
out:
mutex_unlock(&vsock_register_mutex);
return retval;
}
EXPORT_SYMBOL_GPL(vsock_core_init);
EXPORT_SYMBOL_GPL(__vsock_core_init);
void vsock_core_exit(void)
{
@ -2000,5 +1997,5 @@ EXPORT_SYMBOL_GPL(vsock_core_exit);
MODULE_AUTHOR("VMware, Inc.");
MODULE_DESCRIPTION("VMware Virtual Socket Family");
MODULE_VERSION("1.0.0.0-k");
MODULE_VERSION("1.0.1.0-k");
MODULE_LICENSE("GPL v2");