Skip to content

L
linux
Commit df4b68ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Fix SMP/preemption race condition in vm86 entry mode.

parent 37f7d708
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
arch/i386/kernel/vm86.c
View file @ df4b68ca
...@@ -289,9 +289,10 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk ...@@ -289,9 +289,10 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
asm volatile("movl %%fs,%0":"=m" (tsk->thread.saved_fs)); asm volatile("movl %%fs,%0":"=m" (tsk->thread.saved_fs));
asm volatile("movl %%gs,%0":"=m" (tsk->thread.saved_gs)); asm volatile("movl %%gs,%0":"=m" (tsk->thread.saved_gs));
tss = init_tss + smp_processor_id(); tss = init_tss + get_cpu();
tss->esp0 = tsk->thread.esp0 = (unsigned long) &info->VM86_TSS_ESP0; tss->esp0 = tsk->thread.esp0 = (unsigned long) &info->VM86_TSS_ESP0;
disable_sysenter(tss); disable_sysenter(tss);
put_cpu();
tsk->thread.screen_bitmap = info->screen_bitmap; tsk->thread.screen_bitmap = info->screen_bitmap;
if (info->flags & VM86_SCREEN_BITMAP) if (info->flags & VM86_SCREEN_BITMAP)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7