sched/eevdf: Fix heap corruption more

Peter Zijlstra · Peter Zijlstra · commit d2929762cc3f · 2023-10-18T10:22:13.000+02:00
Because someone is a flaming idiot... and forgot we have current as se->on_rq but not actually in the tree itself, and walking rb_parent() on an entry not in the tree is 'funky' and KASAN complains. Fixes: 8dafa9d ("sched/eevdf: Fix min_deadline heap integrity") Reported-by: 0599jiangyc@gmail.com Reported-by: Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Tested-by: Dmitry Safonov <0x7f454c46@gmail.com> Link: https://bugzilla.kernel.org/show_bug.cgi?id=218020 Link: https://lkml.kernel.org/r/CAJwJo6ZGXO07%3DQvW4fgQfbsDzQPs9xj5sAQ1zp%3DmAyPMNbHYww%40mail.gmail.com
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`