diff options
| author | Bart Westgeest <bart@elbrys.com> | 2012-01-25 13:46:32 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-08 14:14:15 -0800 |
| commit | 737912e11bf5bd4874acc771d8511a6eab891fc5 (patch) | |
| tree | d5af155fa17a25e2ce253e32c47c13408e739fe0 | |
| parent | 4c0029f01f4009d6ab149230026c9716bde96283 (diff) | |
| download | linux-3.10-737912e11bf5bd4874acc771d8511a6eab891fc5.tar.gz linux-3.10-737912e11bf5bd4874acc771d8511a6eab891fc5.tar.bz2 linux-3.10-737912e11bf5bd4874acc771d8511a6eab891fc5.zip | |
staging: usbip: fix to prevent potentially using uninitialized spinlock
The stub_probe function can be called as soon as the stub_driver is
registered. This can lead to the busid_table_lock being used before it
is initialized. Moved calling the init_busid_table function (which
initalizes this spinlock) to be called earlier in the init function to
prevent this from happening.
Signed-off-by: Bart Westgeest <bart@elbrys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/usbip/stub_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/usbip/stub_main.c b/drivers/staging/usbip/stub_main.c index 2d631785006..705a9e530a1 100644 --- a/drivers/staging/usbip/stub_main.c +++ b/drivers/staging/usbip/stub_main.c @@ -246,8 +246,9 @@ static int __init usbip_host_init(void) { int ret; - stub_priv_cache = KMEM_CACHE(stub_priv, SLAB_HWCACHE_ALIGN); + init_busid_table(); + stub_priv_cache = KMEM_CACHE(stub_priv, SLAB_HWCACHE_ALIGN); if (!stub_priv_cache) { pr_err("kmem_cache_create failed\n"); return -ENOMEM; @@ -266,7 +267,6 @@ static int __init usbip_host_init(void) goto err_create_file; } - init_busid_table(); pr_info(DRIVER_DESC " v" USBIP_VERSION "\n"); return ret; |