Skip to content

Commit 13cccaf

Browse files
Brian FosterVasily Gorbik
authored andcommitted
s390: fix double free of GS and RI CBs on fork() failure
The pointers for guarded storage and runtime instrumentation control blocks are stored in the thread_struct of the associated task. These pointers are initially copied on fork() via arch_dup_task_struct() and then cleared via copy_thread() before fork() returns. If fork() happens to fail after the initial task dup and before copy_thread(), the newly allocated task and associated thread_struct memory are freed via free_task() -> arch_release_task_struct(). This results in a double free of the guarded storage and runtime info structs because the fields in the failed task still refer to memory associated with the source task. This problem can manifest as a BUG_ON() in set_freepointer() (with CONFIG_SLAB_FREELIST_HARDENED enabled) or KASAN splat (if enabled) when running trinity syscall fuzz tests on s390x. To avoid this problem, clear the associated pointer fields in arch_dup_task_struct() immediately after the new task is copied. Note that the RI flag is still cleared in copy_thread() because it resides in thread stack memory and that is where stack info is copied. Signed-off-by: Brian Foster <[email protected]> Fixes: 8d9047f ("s390/runtime instrumentation: simplify task exit handling") Fixes: 7b83c62 ("s390/guarded storage: simplify task exit handling") Cc: <[email protected]> # 4.15 Reviewed-by: Gerald Schaefer <[email protected]> Reviewed-by: Heiko Carstens <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vasily Gorbik <[email protected]>
1 parent 1c23f9e commit 13cccaf

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

arch/s390/kernel/process.c

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,18 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)
9191

9292
memcpy(dst, src, arch_task_struct_size);
9393
dst->thread.fpu.regs = dst->thread.fpu.fprs;
94+
95+
/*
96+
* Don't transfer over the runtime instrumentation or the guarded
97+
* storage control block pointers. These fields are cleared here instead
98+
* of in copy_thread() to avoid premature freeing of associated memory
99+
* on fork() failure. Wait to clear the RI flag because ->stack still
100+
* refers to the source thread.
101+
*/
102+
dst->thread.ri_cb = NULL;
103+
dst->thread.gs_cb = NULL;
104+
dst->thread.gs_bc_cb = NULL;
105+
94106
return 0;
95107
}
96108

@@ -150,13 +162,11 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args)
150162
frame->childregs.flags = 0;
151163
if (new_stackp)
152164
frame->childregs.gprs[15] = new_stackp;
153-
154-
/* Don't copy runtime instrumentation info */
155-
p->thread.ri_cb = NULL;
165+
/*
166+
* Clear the runtime instrumentation flag after the above childregs
167+
* copy. The CB pointer was already cleared in arch_dup_task_struct().
168+
*/
156169
frame->childregs.psw.mask &= ~PSW_MASK_RI;
157-
/* Don't copy guarded storage control block */
158-
p->thread.gs_cb = NULL;
159-
p->thread.gs_bc_cb = NULL;
160170

161171
/* Set a new TLS ? */
162172
if (clone_flags & CLONE_SETTLS) {

0 commit comments

Comments
 (0)