staging: gasket: core: protect against races during unregister

Keep mutex held across the unregistration operation, until the
driver_desc field of the global table is removed, to prevent a
concurrent accessor from looking up the driver_desc while
gasket_unregister_device() is in the processing of removing it.

Reported-by: Guenter Roeck <groeck@chromium.org>
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/gasket/gasket_core.c b/drivers/staging/gasket/gasket_core.c
index ace92f1..a6462b6 100644 (file)
--- a/drivers/staging/gasket/gasket_core.c
+++ b/drivers/staging/gasket/gasket_core.c
@@ -1765,9 +1765,9 @@ void gasket_unregister_device(const struct gasket_driver_desc *driver_desc)
                        break;
                }
        }
-       mutex_unlock(&g_mutex);
 
        if (!internal_desc) {
+               mutex_unlock(&g_mutex);
                pr_err("request to unregister unknown desc: %s, %d:%d\n",
                       driver_desc->name, driver_desc->major,
                       driver_desc->minor);
@@ -1780,7 +1780,6 @@ void gasket_unregister_device(const struct gasket_driver_desc *driver_desc)
        class_destroy(internal_desc->class);
 
        /* Finally, effectively "remove" the driver. */
-       mutex_lock(&g_mutex);
        g_descs[desc_idx].driver_desc = NULL;
        mutex_unlock(&g_mutex);