projects/linux·commit 45d3291c

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

45d3291c · Linus Torvalds <[email protected]> · 2023-10-21 11:19:07 -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
Commit
45d3291c5201fced351e62d714e2912400cc7f4d
Parents
94be133f · d2929762

Merge commit. Changes below are compared with the first parent: 94be133f.

Changes

1 files changed · +2 −1

FileStatusAddDelContent
kernel/sched/fair.cmodified+2−1View file

kernel/sched/fair.c

View file
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 061a30a..df348aa 100644
--- 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