linuxmsm/laptops-kernel
0
0
Fork 0
mirror of https://github.com/linux-msm/laptops-kernel.git synced 2026-08-13 14:19:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

timekeeping: Unwind aux clock sysfs children on failure

Browse Source 
tk_aux_sysfs_init() creates one child kobject per auxiliary clock. If a
later child or sysfs group creation fails, the current error path only
puts the parent kobjects and leaves earlier children and groups behind.

Store the child kobjects during init and remove the successfully created
groups and kobjects on failure.

Fixes: 7b5ab04f03 ("timekeeping: Fix resource leak in tk_aux_sysfs_init() error paths")
Signed-off-by: Yuho Choi <dbgh9129@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260703165337.168445-1-dbgh9129@gmail.com
This commit is contained in:
Yuho Choi
2026-07-07 23:26:58 +02:00
committed by Thomas Gleixner
parent 3dee6537e7
commit f2eee7e31c
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/time/timekeeping.c
+15 -6
View File
@@ -3327,7 +3327,9 @@ static const struct attribute_group aux_clock_enable_attr_group = {
static int __init tk_aux_sysfs_init(void)
{
struct kobject *auxo, *tko = kobject_create_and_add("time", kernel_kobj);
struct kobject *clks[MAX_AUX_CLOCKS];
int ret = -ENOMEM;
int i;
if (!tko)
return ret;
@@ -3336,21 +3338,28 @@ static int __init tk_aux_sysfs_init(void)
if (!auxo)
goto err_clean;
for (int i = 0; i < MAX_AUX_CLOCKS; i++) {
for (i = 0; i < MAX_AUX_CLOCKS; i++) {
char id[2] = { [0] = '0' + i, };
struct kobject *clk = kobject_create_and_add(id, auxo);
clks[i] = kobject_create_and_add(id, auxo);
if (!clk) {
if (!clks[i]) {
ret = -ENOMEM;
goto err_clean;
goto err_clks;
}
ret = sysfs_create_group(clk, &aux_clock_enable_attr_group);
ret = sysfs_create_group(clks[i], &aux_clock_enable_attr_group);
if (ret)
goto err_clean;
goto err_clk;
}
return 0;
err_clk:
kobject_put(clks[i]);
err_clks:
while (--i >= 0) {
sysfs_remove_group(clks[i], &aux_clock_enable_attr_group);
kobject_put(clks[i]);
}
err_clean:
kobject_put(auxo);
kobject_put(tko);