memstick: fix memory leak if card device is never registered
commit4b6d621c9d
upstream. 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:0252c3b4f0
("memstick: struct device - replace bus_id with dev_name(), dev_set_name()") Cc: stable <stable@kernel.org> Co-developed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Co-developed-by: Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr> Signed-off-by: Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr> Link: https://lore.kernel.org/r/20230401200327.16800-1-gregkh@linuxfoundation.org Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
8c168553ab
Коммит
ebab1a86ca
|
@ -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)
|
||||||
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:
|
||||||
|
|
Загрузка…
Ссылка в новой задаче