diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-10 10:15:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-10 10:15:58 -0700 |
| commit | 92d503011f2fa2c85624dde43429cd0c6a25ef6a (patch) | |
| tree | 7db8fe19fbde4f22e3a8ab895d3165ab7735bf7e | |
| parent | 98957025cf146a0240bb9ffaf50727ac786078ee (diff) | |
| parent | d7ad05c86e2191bd66e5b62fca8da53c4a53484f (diff) | |
Merge tag 'timers-urgent-2024-05-10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Ingo Molnar:
"Fix possible (but unlikely) out-of-bounds access in the timer
migration per-CPU-init code"
* tag 'timers-urgent-2024-05-10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
timers/migration: Prevent out of bounds access on failure
| -rw-r--r-- | kernel/time/timer_migration.c | 4 |
1 files 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); |