瀏覽代碼

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>
Todd Poynor 7 年之前
父節點
當前提交
95a2c279b2
共有 1 個文件被更改,包括 1 次插入2 次删除
  1. 1 2
      drivers/staging/gasket/gasket_core.c

+ 1 - 2
drivers/staging/gasket/gasket_core.c

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