]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
sched_ext: Fix missing return after scx_error() in scx_dsq_move()
authorCheng-Yang Chou <yphbchou0911@gmail.com>
Thu, 26 Mar 2026 01:29:03 +0000 (09:29 +0800)
committerTejun Heo <tj@kernel.org>
Thu, 26 Mar 2026 02:31:53 +0000 (16:31 -1000)
When scx_bpf_dsq_move[_vtime]() is called on a task that belongs to a
different scheduler, scx_error() is invoked to flag the violation.
scx_error() schedules an asynchronous scheduler teardown via irq_work
and returns immediately, so execution falls through and the DSQ move
proceeds on a cross-scheduler task regardless, potentially corrupting
DSQ state.

Add the missing return false so the function exits right after
reporting the error, consistent with the other early-exit checks in
the same function (e.g. scx_vet_enq_flags() failure at the top).

Fixes: bb4d9fd55158 ("sched_ext: scx_dsq_move() should validate the task belongs to the right scheduler")
Signed-off-by: Cheng-Yang Chou <yphbchou0911@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
kernel/sched/ext.c

index 551bfb99157d1720dbb5895218a53349747167e6..a5d8871ac865122f245bcaeb81154aed83cf4965 100644 (file)
@@ -8094,6 +8094,7 @@ static bool scx_dsq_move(struct bpf_iter_scx_dsq_kern *kit,
        if (unlikely(!scx_task_on_sched(sch, p))) {
                scx_error(sch, "scx_bpf_dsq_move[_vtime]() on %s[%d] but the task belongs to a different scheduler",
                          p->comm, p->pid);
+               return false;
        }
 
        /*