summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2026-06-07 12:54:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2026-06-07 12:54:37 -0700
commit77e8e6861bc000b90ad37b4cceccbe0da5f4fc6a (patch)
tree27aa783f1859087e6d1c54250700a1d6a3e0f0ad /include/linux
parent96c1ddbc16f4dd15d6d359ce55ba29e8cd80dc46 (diff)
parent6d99479799c69c3cb588fcda19c81d8f61d64ecd (diff)
Merge tag 'sched-urgent-2026-06-07' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull rseq fix from Ingo Molnar: - Fix uninitialized stack variable in rseq_exit_user_update() (Qing Wang) * tag 'sched-urgent-2026-06-07' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: rseq: Fix using an uninitialized stack variable in rseq_exit_user_update()
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/rseq_entry.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/rseq_entry.h b/include/linux/rseq_entry.h
index 63bc72086e75..ed9da6e41a2a 100644
--- a/include/linux/rseq_entry.h
+++ b/include/linux/rseq_entry.h
@@ -635,10 +635,11 @@ static __always_inline bool rseq_exit_user_update(struct pt_regs *regs, struct t
return true;
}
+ int cpu = task_cpu(t);
struct rseq_ids ids = {
- .cpu_id = task_cpu(t),
+ .cpu_id = cpu,
.mm_cid = task_mm_cid(t),
- .node_id = cpu_to_node(ids.cpu_id),
+ .node_id = cpu_to_node(cpu),
};
return rseq_update_usr(t, regs, &ids);