[v2] time/timgr: Fix wrong reference when level 0 group allocation failed

[PATCH v2] time/timgr: Fix wrong reference when level 0 group allocation failed

Levi Yun posted 1 patch 2 weeks ago

Diff against v1 v1 v3
Download mbox

There is a newer version of this series

kernel/time/timer_migration.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Expand all Fold all

[PATCH v2] time/timgr: Fix wrong reference when level 0 group allocation failed

Posted by Levi Yun 2 weeks ago

When tmigr_setup_groups() failed level 0 group allocation,
wrong reference happens on local stack array while intializing timer hierarchy.

To prevent this, Check loop condition first before intializing timer hierarchy.

Fixes: 7ee988770326 ("timers: Implement the hierarchical pull model")
Signed-off-by: Levi Yun <ppbuk5246@gmail.com>
---

v2:
	- Modify commit message.

 kernel/time/timer_migration.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/time/timer_migration.c b/kernel/time/timer_migration.c
index ccba875d2234..84413114db5c 100644
--- a/kernel/time/timer_migration.c
+++ b/kernel/time/timer_migration.c
@@ -1596,7 +1596,7 @@ static int tmigr_setup_groups(unsigned int cpu, unsigned int node)

 	} while (i < tmigr_hierarchy_levels);

-	do {
+	while (i > 0) {
 		group = stack[--i];

 		if (err < 0) {
@@ -1645,7 +1645,7 @@ static int tmigr_setup_groups(unsigned int cpu, unsigned int node)
 				tmigr_connect_child_parent(child, group);
 			}
 		}
-	} while (i > 0);
+	}

 	kfree(stack);

--
2.41.0

Re: [v2] time/timgr: Fix wrong reference when level 0 group allocation failed

Posted by Markus Elfring 2 weeks ago

…
> To prevent this, Check loop condition first before intializing timer hierarchy.

I suggest to avoid another typo (also in the email address for Frederic Weisbecker).

Regards,
Markus