Skip to content

Commit 823086b

Browse files
Dave Martingregkh
authored andcommitted
arm64: fpsimd: Prevent registers leaking across exec
commit 096622104e14d8a1db4860bd557717067a0515d2 upstream. There are some tricky dependencies between the different stages of flushing the FPSIMD register state during exec, and these can race with context switch in ways that can cause the old task's regs to leak across. In particular, a context switch during the memset() can cause some of the task's old FPSIMD registers to reappear. Disabling preemption for this small window would be no big deal for performance: preemption is already disabled for similar scenarios like updating the FPSIMD registers in sigreturn. So, instead of rearranging things in ways that might swap existing subtle bugs for new ones, this patch just disables preemption around the FPSIMD state flushing so that races of this type can't occur here. This brings fpsimd_flush_thread() into line with other code paths. Fixes: 674c242 ("arm64: flush FP/SIMD state correctly after execve()") Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Dave Martin <Dave.Martin@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 218720f commit 823086b

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

arch/arm64/kernel/fpsimd.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,11 @@ void fpsimd_thread_switch(struct task_struct *next)
157157

158158
void fpsimd_flush_thread(void)
159159
{
160+
preempt_disable();
160161
memset(&current->thread.fpsimd_state, 0, sizeof(struct fpsimd_state));
161162
fpsimd_flush_task_state(current);
162163
set_thread_flag(TIF_FOREIGN_FPSTATE);
164+
preempt_enable();
163165
}
164166

165167
/*

0 commit comments

Comments
 (0)