x86/mce: Recover from poison found while copying from user space

[sfrench/cifs-2.6.git] / arch / x86 / kernel / cpu / mce / core.c

diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index 2d6caf09e8e6a9d3d210950273bad7f7d9512ee1..5c423c4bab6828299190071c46c0fc6d5dac60da 100644 (file)
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -1260,6 +1260,21 @@ static void kill_me_maybe(struct callback_head *cb)
        kill_me_now(cb);
 }
 
+static void queue_task_work(struct mce *m, int kill_it)
+{
+       current->mce_addr = m->addr;
+       current->mce_kflags = m->kflags;
+       current->mce_ripv = !!(m->mcgstatus & MCG_STATUS_RIPV);
+       current->mce_whole_page = whole_page(m);
+
+       if (kill_it)
+               current->mce_kill_me.func = kill_me_now;
+       else
+               current->mce_kill_me.func = kill_me_maybe;
+
+       task_work_add(current, &current->mce_kill_me, true);
+}
+
 /*
  * The actual machine check handler. This only handles real
  * exceptions when something got corrupted coming in through int 18.
@@ -1401,13 +1416,8 @@ noinstr void do_machine_check(struct pt_regs *regs)
                /* If this triggers there is no way to recover. Die hard. */
                BUG_ON(!on_thread_stack() || !user_mode(regs));
 
-               current->mce_addr = m.addr;
-               current->mce_ripv = !!(m.mcgstatus & MCG_STATUS_RIPV);
-               current->mce_whole_page = whole_page(&m);
-               current->mce_kill_me.func = kill_me_maybe;
-               if (kill_it)
-                       current->mce_kill_me.func = kill_me_now;
-               task_work_add(current, &current->mce_kill_me, true);
+               queue_task_work(&m, kill_it);
+
        } else {
                /*
                 * Handle an MCE which has happened in kernel space but from
@@ -1422,6 +1432,9 @@ noinstr void do_machine_check(struct pt_regs *regs)
                        if (!fixup_exception(regs, X86_TRAP_MC, 0, 0))
                                mce_panic("Failed kernel mode recovery", &m, msg);
                }
+
+               if (m.kflags & MCE_IN_KERNEL_COPYIN)
+                       queue_task_work(&m, kill_it);
        }
 out:
        mce_wrmsrl(MSR_IA32_MCG_STATUS, 0);