Skip to content

Commit 50af0ba

Browse files
Yang Yinglianggregkh
authored andcommitted
platform/x86: intel_scu_ipc: fix possible name leak in __intel_scu_ipc_register()
[ Upstream commit 0b3d0cb ] 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: 54b34aa ("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>
1 parent 3cf8150 commit 50af0ba

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/platform/x86/intel_scu_ipc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,6 @@ __intel_scu_ipc_register(struct device *parent,
583583
scu->dev.parent = parent;
584584
scu->dev.class = &intel_scu_ipc_class;
585585
scu->dev.release = intel_scu_ipc_release;
586-
dev_set_name(&scu->dev, "intel_scu_ipc");
587586

588587
if (!request_mem_region(scu_data->mem.start, resource_size(&scu_data->mem),
589588
"intel_scu_ipc")) {
@@ -612,6 +611,7 @@ __intel_scu_ipc_register(struct device *parent,
612611
* After this point intel_scu_ipc_release() takes care of
613612
* releasing the SCU IPC resources once refcount drops to zero.
614613
*/
614+
dev_set_name(&scu->dev, "intel_scu_ipc");
615615
err = device_register(&scu->dev);
616616
if (err) {
617617
put_device(&scu->dev);

0 commit comments

Comments
 (0)