platform/x86: intel_scu_ipc: fix possible name leak in __intel_scu_ipc_register()
[ Upstream commit 0b3d0cb7c0bed2fd6454f77ed75e7a662c6efd12 ]
In some error paths before device_register(), the names allocated
by dev_set_name() are not freed. Move dev_set_name() front to
device_register(), so the name can be freed while calling
put_device().
Fixes: 54b34aa0a7
("platform/x86: intel_scu_ipc: Split out SCU IPC functionality from the SCU driver")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20221208151916.2404977-1-yangyingliang@huawei.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
17cd8c46cb
commit
d4c38ee665
@@ -583,7 +583,6 @@ __intel_scu_ipc_register(struct device *parent,
|
|||||||
scu->dev.parent = parent;
|
scu->dev.parent = parent;
|
||||||
scu->dev.class = &intel_scu_ipc_class;
|
scu->dev.class = &intel_scu_ipc_class;
|
||||||
scu->dev.release = intel_scu_ipc_release;
|
scu->dev.release = intel_scu_ipc_release;
|
||||||
dev_set_name(&scu->dev, "intel_scu_ipc");
|
|
||||||
|
|
||||||
if (!request_mem_region(scu_data->mem.start, resource_size(&scu_data->mem),
|
if (!request_mem_region(scu_data->mem.start, resource_size(&scu_data->mem),
|
||||||
"intel_scu_ipc")) {
|
"intel_scu_ipc")) {
|
||||||
@@ -612,6 +611,7 @@ __intel_scu_ipc_register(struct device *parent,
|
|||||||
* After this point intel_scu_ipc_release() takes care of
|
* After this point intel_scu_ipc_release() takes care of
|
||||||
* releasing the SCU IPC resources once refcount drops to zero.
|
* releasing the SCU IPC resources once refcount drops to zero.
|
||||||
*/
|
*/
|
||||||
|
dev_set_name(&scu->dev, "intel_scu_ipc");
|
||||||
err = device_register(&scu->dev);
|
err = device_register(&scu->dev);
|
||||||
if (err) {
|
if (err) {
|
||||||
put_device(&scu->dev);
|
put_device(&scu->dev);
|
||||||
|
Reference in New Issue
Block a user