Commit 92d50301 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 98957025 d7ad05c8

kernel/time/timer_migration.c

+2 −2
Original line number Diff line number Diff line
@@ -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);