Skip to contentSkip to conversation

firmware_loader: Fix use-after-free during unregister

PATCH Superseded Russ Weight 1 participant 1 message Aug 2, 2022

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 firmware_loader: Fix use-after-free during unregister

In the following code within firmware_upload_unregister(), the call to device_unregister() results in the dev_release function freeing the fw_upload_priv structure before it is dereferenced for the call to module_put():

  device_unregister(&fw_sysfs->dev);
  module_put(fw_upload_priv->module);

This is fixed by copying fw_upload_priv->module to a local variable before calling device_unregister() and then using the local variable for the call to module_put().

Fixes 97730bbb242c (firmware_loader: Add firmware-upload support)
---
 drivers/base/firmware_loader/sysfs_upload.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/base/firmware_loader/sysfs_upload.c +2 -1
index 87044d52322a..63e15bddd80c 100644
@@ -377,6 +377,7 @@ void firmware_upload_unregister(struct fw_upload *fw_upload)
 {
 	struct fw_sysfs *fw_sysfs = fw_upload->priv;
 	struct fw_upload_priv *fw_upload_priv = fw_sysfs->fw_upload_priv;
+	struct module *module = fw_upload_priv->module;
 
 	mutex_lock(&fw_upload_priv->lock);
 	if (fw_upload_priv->progress == FW_UPLOAD_PROG_IDLE) {
@@ -392,6 +393,6 @@ void firmware_upload_unregister(struct fw_upload *fw_upload)
 
 unregister:
 	device_unregister(&fw_sysfs->dev);
-	module_put(fw_upload_priv->module);
+	module_put(module);
 }
 EXPORT_SYMBOL_GPL(firmware_upload_unregister);
Signature · 1 line
2.25.1