Commit-ID: baa916f39b50ad91661534652110df40396acda0 Gitweb: http://git.kernel.org/tip/baa916f39b50ad91661534652110df40396acda0 Author: Borislav Petkov <bp@xxxxxxx> AuthorDate: Fri, 25 Apr 2014 13:40:10 +0200 Committer: Matt Fleming <matt.fleming@xxxxxxxxx> CommitDate: Sat, 3 May 2014 06:39:25 +0100 x86/efi: Check for unsafe dealing with FPU state in irq ctxt efi_call can happen in an irq context (pstore) and there we really need to make sure we're not scribbling over FPU state while we've interrupted a thread or kernel mode with a live FPU state. Therefore, use the kernel_fpu_begin/end() variants which do that check. Signed-off-by: Borislav Petkov <bp@xxxxxxx> Cc: Ricardo Neri <ricardo.neri-calderon@xxxxxxxxxxxxxxx> Signed-off-by: Matt Fleming <matt.fleming@xxxxxxxxx> --- arch/x86/include/asm/efi.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h index 1eb5f64..f969ce8 100644 --- a/arch/x86/include/asm/efi.h +++ b/arch/x86/include/asm/efi.h @@ -67,11 +67,9 @@ extern u64 asmlinkage efi_call(void *fp, ...); efi_status_t __s; \ \ efi_sync_low_kernel_mappings(); \ - preempt_disable(); \ - __kernel_fpu_begin(); \ + kernel_fpu_begin(); \ __s = efi_call((void *)efi.systab->runtime->f, __VA_ARGS__); \ - __kernel_fpu_end(); \ - preempt_enable(); \ + kernel_fpu_end(); \ __s; \ }) -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|