[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20260205024537.100664-1-zhanxusheng@xiaomi.com>
Date: Thu, 5 Feb 2026 10:45:37 +0800
From: Zhan Xusheng <zhanxusheng1024@...il.com>
To: Thomas Gleixner <tglx@...nel.org>
Cc: linux-kernel@...r.kernel.org,
Zhan Xusheng <zhanxusheng@...omi.com>
Subject: [PATCH v2] timers/migration: Ensure proper resource cleanup on error in tmigr_init
Free resources allocated by zalloc_cpumask_var and kcalloc on failure.
Reviewed-by: Thomas Gleixner <tglx@...nel.org>
Signed-off-by: Zhan Xusheng <zhanxusheng@...omi.com>
---
kernel/time/timer_migration.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/kernel/time/timer_migration.c b/kernel/time/timer_migration.c
index 18dda1aa782d..ab8354ad85be 100644
--- a/kernel/time/timer_migration.c
+++ b/kernel/time/timer_migration.c
@@ -1994,7 +1994,7 @@ static int __init tmigr_init(void)
tmigr_level_list = kcalloc(tmigr_hierarchy_levels, sizeof(struct list_head), GFP_KERNEL);
if (!tmigr_level_list)
- goto err;
+ goto err_free_cpumask;
for (i = 0; i < tmigr_hierarchy_levels; i++)
INIT_LIST_HEAD(&tmigr_level_list[i]);
@@ -2007,15 +2007,24 @@ static int __init tmigr_init(void)
ret = cpuhp_setup_state(CPUHP_TMIGR_PREPARE, "tmigr:prepare",
tmigr_cpu_prepare, NULL);
if (ret)
- goto err;
+ goto err_free_level_list;
ret = cpuhp_setup_state(CPUHP_AP_TMIGR_ONLINE, "tmigr:online",
tmigr_set_cpu_available, tmigr_clear_cpu_available);
if (ret)
- goto err;
+ goto err_remove_prepare_state;
return 0;
+err_remove_prepare_state:
+ cpuhp_remove_state(CPUHP_TMIGR_PREPARE);
+
+err_free_level_list:
+ kfree(tmigr_level_list);
+
+err_free_cpumask:
+ free_cpumask_var(tmigr_available_cpumask);
+
err:
pr_err("Timer migration setup failed\n");
return ret;
--
2.43.0
Powered by blists - more mailing lists