Commit deb7b2f9 authored by Tejun Heo's avatar Tejun Heo
Browse files

sched_ext: Release cpus_read_lock on scx_link_sched() failure in root enable 



scx_root_enable_workfn() takes cpus_read_lock() before
scx_link_sched(sch), but the `if (ret) goto err_disable` on failure
skips the matching cpus_read_unlock() - all other err_disable gotos
along this path drop the lock first.

scx_link_sched() only returns non-zero on the sub-sched path
(parent != NULL), so the leak path is unreachable via the root
caller today. Still, the unwind is out of line with the surrounding
paths.

Drop cpus_read_lock() before goto err_disable.

v2: Correct Fixes: tag (Andrea Righi).

Fixes: 25037af7 ("sched_ext: Add rhashtable lookup for sub-schedulers")
Reported-by: default avatarChris Mason <clm@meta.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 05b4a9a9

kernel/sched/ext.c

+3 −1
Original line number Diff line number Diff line
@@ -6736,8 +6736,10 @@ static void scx_root_enable_workfn(struct kthread_work *work) 
	rcu_assign_pointer(scx_root, sch);



	ret = scx_link_sched(sch);

	if (ret)

	if (ret) {

		cpus_read_unlock();

		goto err_disable;

	}



	scx_idle_enable(ops);