leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdkfd: Fix reference count leaks.

Browse Source 
kobject_init_and_add() takes reference even when it fails.
If this function returns an error, kobject_put() must be called to
properly clean up the memory associated with the object.

Signed-off-by: Qiushi Wu <wu000273@umn.edu>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Qiushi Wu
2020-06-13 14:32:26 -05:00
committed by Alex Deucher
parent b205795677
commit 20eca0123a
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/drm/amd/amdkfd/kfd_topology.c
View File

@@ -636,8 +636,10 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev,
ret = kobject_init_and_add(dev->kobj_node, &node_type, ret = kobject_init_and_add(dev->kobj_node, &node_type,
sys_props.kobj_nodes, "%d", id); sys_props.kobj_nodes, "%d", id);
if (ret < 0) if (ret < 0) {
kobject_put(dev->kobj_node);
return ret; return ret;
}
dev->kobj_mem = kobject_create_and_add("mem_banks", dev->kobj_node); dev->kobj_mem = kobject_create_and_add("mem_banks", dev->kobj_node);
if (!dev->kobj_mem) if (!dev->kobj_mem)
@@ -684,8 +686,10 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev,
return -ENOMEM; return -ENOMEM;
ret = kobject_init_and_add(mem->kobj, &mem_type, ret = kobject_init_and_add(mem->kobj, &mem_type,
dev->kobj_mem, "%d", i); dev->kobj_mem, "%d", i);
if (ret < 0) if (ret < 0) {
kobject_put(mem->kobj);
return ret; return ret;
}
mem->attr.name = "properties"; mem->attr.name = "properties";
mem->attr.mode = KFD_SYSFS_FILE_MODE; mem->attr.mode = KFD_SYSFS_FILE_MODE;
@@ -703,8 +707,10 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev,
return -ENOMEM; return -ENOMEM;
ret = kobject_init_and_add(cache->kobj, &cache_type, ret = kobject_init_and_add(cache->kobj, &cache_type,
dev->kobj_cache, "%d", i); dev->kobj_cache, "%d", i);
if (ret < 0) if (ret < 0) {
kobject_put(cache->kobj);
return ret; return ret;
}
cache->attr.name = "properties"; cache->attr.name = "properties";
cache->attr.mode = KFD_SYSFS_FILE_MODE; cache->attr.mode = KFD_SYSFS_FILE_MODE;
@@ -722,8 +728,10 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev,
return -ENOMEM; return -ENOMEM;
ret = kobject_init_and_add(iolink->kobj, &iolink_type, ret = kobject_init_and_add(iolink->kobj, &iolink_type,
dev->kobj_iolink, "%d", i); dev->kobj_iolink, "%d", i);
if (ret < 0) if (ret < 0) {
kobject_put(iolink->kobj);
return ret; return ret;
}
iolink->attr.name = "properties"; iolink->attr.name = "properties";
iolink->attr.mode = KFD_SYSFS_FILE_MODE; iolink->attr.mode = KFD_SYSFS_FILE_MODE;
@@ -802,8 +810,10 @@ static int kfd_topology_update_sysfs(void)
ret = kobject_init_and_add(sys_props.kobj_topology, ret = kobject_init_and_add(sys_props.kobj_topology,
&sysprops_type, &kfd_device->kobj, &sysprops_type, &kfd_device->kobj,
"topology"); "topology");
if (ret < 0) if (ret < 0) {
kobject_put(sys_props.kobj_topology);
return ret; return ret;
}
sys_props.kobj_nodes = kobject_create_and_add("nodes", sys_props.kobj_nodes = kobject_create_and_add("nodes",
sys_props.kobj_topology); sys_props.kobj_topology);