Skip to content

Commit 5d3b81d

Browse files
benzeaIngo Molnar
authored andcommitted
x86/fpu: Avoid copying dynamic FP state from init_task in arch_dup_task_struct()
The init_task instance of struct task_struct is statically allocated and may not contain the full FP state for userspace. As such, limit the copy to the valid area of both init_task and 'dst' and ensure all memory is initialized. Note that the FP state is only needed for userspace, and as such it is entirely reasonable for init_task to not contain parts of it. Fixes: 5aaeb5c ("x86/fpu, sched: Introduce CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT and use it on x86") Signed-off-by: Benjamin Berg <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Oleg Nesterov <[email protected]> Link: https://lore.kernel.org/r/[email protected] ---- v2: - Fix code if arch_task_struct_size < sizeof(init_task) by using memcpy_and_pad.
1 parent 2ec01bd commit 5d3b81d

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

arch/x86/kernel/process.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,12 @@ EXPORT_PER_CPU_SYMBOL_GPL(__tss_limit_invalid);
9393
*/
9494
int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)
9595
{
96-
memcpy(dst, src, arch_task_struct_size);
96+
/* init_task is not dynamically sized (incomplete FPU state) */
97+
if (unlikely(src == &init_task))
98+
memcpy_and_pad(dst, arch_task_struct_size, src, sizeof(init_task), 0);
99+
else
100+
memcpy(dst, src, arch_task_struct_size);
101+
97102
#ifdef CONFIG_VM86
98103
dst->thread.vm86 = NULL;
99104
#endif

0 commit comments

Comments
 (0)