Skip to content

Commit 463f550

Browse files
compudjIngo Molnar
authored andcommitted
rseq: Unregister rseq for clone CLONE_VM
It has been reported by Google that rseq is not behaving properly with respect to clone when CLONE_VM is used without CLONE_THREAD. It keeps the prior thread's rseq TLS registered when the TLS of the thread has moved, so the kernel can corrupt the TLS of the parent. The approach of clearing the per task-struct rseq registration on clone with CLONE_THREAD flag is incomplete. It does not cover the use-case of clone with CLONE_VM set, but without CLONE_THREAD. Here is the rationale for unregistering rseq on clone with CLONE_VM flag set: 1) CLONE_THREAD requires CLONE_SIGHAND, which requires CLONE_VM to be set. Therefore, just checking for CLONE_VM covers all CLONE_THREAD uses. There is no point in checking for both CLONE_THREAD and CLONE_VM, 2) There is the possibility of an unlikely scenario where CLONE_SETTLS is used without CLONE_VM. In order to be an issue, it would require that the rseq TLS is in a shared memory area. I do not plan on adding CLONE_SETTLS to the set of clone flags which unregister RSEQ, because it would require that we also unregister RSEQ on set_thread_area(2) and arch_prctl(2) ARCH_SET_FS for completeness. So rather than doing a partial solution, it appears better to let user-space explicitly perform rseq unregistration across clone if needed in scenarios where CLONE_VM is not set. Signed-off-by: Mathieu Desnoyers <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 66528a4 commit 463f550

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

include/linux/sched.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1929,11 +1929,11 @@ static inline void rseq_migrate(struct task_struct *t)
19291929

19301930
/*
19311931
* If parent process has a registered restartable sequences area, the
1932-
* child inherits. Only applies when forking a process, not a thread.
1932+
* child inherits. Unregister rseq for a clone with CLONE_VM set.
19331933
*/
19341934
static inline void rseq_fork(struct task_struct *t, unsigned long clone_flags)
19351935
{
1936-
if (clone_flags & CLONE_THREAD) {
1936+
if (clone_flags & CLONE_VM) {
19371937
t->rseq = NULL;
19381938
t->rseq_sig = 0;
19391939
t->rseq_event_mask = 0;

0 commit comments

Comments
 (0)