Merge tag 'sched-urgent-2023-10-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit 45d3291c5201 · 2023-10-21T11:19:07.000-07:00
Pull scheduler fix from Ingo Molnar:
 "Fix a recently introduced use-after-free bug"

* tag 'sched-urgent-2023-10-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/eevdf: Fix heap corruption more
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
@@ -3657,7 +3657,8 @@ static void reweight_entity(struct cfs_rq *cfs_rq, struct sched_entity *se,
 		 */
 		deadline = div_s64(deadline * old_weight, weight);
 		se->deadline = se->vruntime + deadline;
-		min_deadline_cb_propagate(&se->run_node, NULL);
+		if (se != cfs_rq->curr)
+			min_deadline_cb_propagate(&se->run_node, NULL);
 	}
 
 #ifdef CONFIG_SMP

Original file line number	Diff line number	Diff line change
`@@ -3657,7 +3657,8 @@ static void reweight_entity(struct cfs_rq cfs_rq, struct sched_entity se,`
`3657`	`3657`	`*/`
`3658`	`3658`	`deadline = div_s64(deadline * old_weight, weight);`
`3659`	`3659`	`se->deadline = se->vruntime + deadline;`
`3660`		`- min_deadline_cb_propagate(&se->run_node, NULL);`
	`3660`	`+ if (se != cfs_rq->curr)`
	`3661`	`+ min_deadline_cb_propagate(&se->run_node, NULL);`
`3661`	`3662`	`}`
`3662`	`3663`
`3663`	`3664`	`#ifdef CONFIG_SMP`