From: Tejun Heo <tj@kernel.org>
Date: Mon, 11 May 2026 22:43:39 +0000 (-1000)
Subject: Merge branch 'for-7.1-fixes' into for-7.2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=fbce803562169a9735d9d3aa9a15ea28d99f977d;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'for-7.1-fixes' into for-7.2

Pull to receive:

 9a415cc53711 ("sched_ext: Avoid UAF in scx_root_enable_workfn() init failure path")

Conflicts with for-7.2's scx_task_iter_relock() rework. The fix moves
put_task_struct(p) past scx_error(); for-7.2 still has it at the old
position. Resolved by dropping the old one.

Signed-off-by: Tejun Heo <tj@kernel.org>
---

fbce803562169a9735d9d3aa9a15ea28d99f977d
diff --cc kernel/sched/ext.c
index 87146f6e2385a,9354da79e162a..64f8a096f1332
--- a/kernel/sched/ext.c
+++ b/kernel/sched/ext.c
@@@ -7205,7 -6972,7 +7222,6 @@@ static void scx_root_enable_workfn(stru
  		if (unlikely(ret)) {
  			if (scx_get_task_state(p) != SCX_TASK_DEAD)
  				scx_set_task_state(p, SCX_TASK_NONE);
- 			put_task_struct(p);
 -			task_rq_unlock(rq, p, &rf);
  			scx_task_iter_stop(&sti);
  			scx_error(sch, "ops.init_task() failed (%d) for %s[%d]",
  				  ret, p->comm, p->pid);