2024-05-10 11:13:03

by Ingo Molnar

Subject: [GIT PULL] timer fix

Linus,

Please pull the latest timers/urgent Git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-2024-05-10

# HEAD: d7ad05c86e2191bd66e5b62fca8da53c4a53484f timers/migration: Prevent out of bounds access on failure

Fix possible (but unlikely) out-of-bounds access in
the timer migration per-CPU-init code.

Thanks,

Ingo

------------------>
Levi Yun (1):
timers/migration: Prevent out of bounds access on failure


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);

2024-05-10 17:29:36

by pr-tracker-bot

Subject: Re: [GIT PULL] timer fix

The pull request you sent on Fri, 10 May 2024 13:12:49 +0200:

> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-2024-05-10

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/92d503011f2fa2c85624dde43429cd0c6a25ef6a

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html