Commit 4b6d621c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Ulf Hansson

memstick: fix memory leak if card device is never registered

When calling dev_set_name() memory is allocated for the name for the
struct device.  Once that structure device is registered, or attempted
to be registerd, with the driver core, the driver core will handle
cleaning up that memory when the device is removed from the system.

Unfortunatly for the memstick code, there is an error path that causes
the struct device to never be registered, and so the memory allocated in
dev_set_name will be leaked.  Fix that leak by manually freeing it right
before the memory for the device is freed.

Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Cc: Alex Dubov <oakad@yahoo.com>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: linux-mmc@vger.kernel.org
Fixes: 0252c3b4 ("memstick: struct device - replace bus_id with dev_name(), dev_set_name()")
Cc: stable <stable@kernel.org>
Co-developed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Co-developed-by: default avatarMirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr>
Signed-off-by: default avatarMirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr>
Link: https://lore.kernel.org/r/20230401200327.16800-1-gregkh@linuxfoundation.orgSigned-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 2265098f
...@@ -410,6 +410,7 @@ static struct memstick_dev *memstick_alloc_card(struct memstick_host *host) ...@@ -410,6 +410,7 @@ static struct memstick_dev *memstick_alloc_card(struct memstick_host *host)
return card; return card;
err_out: err_out:
host->card = old_card; host->card = old_card;
kfree_const(card->dev.kobj.name);
kfree(card); kfree(card);
return NULL; return NULL;
} }
...@@ -468,8 +469,10 @@ static void memstick_check(struct work_struct *work) ...@@ -468,8 +469,10 @@ static void memstick_check(struct work_struct *work)
put_device(&card->dev); put_device(&card->dev);
host->card = NULL; host->card = NULL;
} }
} else } else {
kfree_const(card->dev.kobj.name);
kfree(card); kfree(card);
}
} }
out_power_off: out_power_off:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment