summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2018-09-04 11:22:12 +0200
committerBorislav Petkov <bp@suse.de>2018-09-21 14:28:37 +0200
commit7401a633c34adc7aefd3edfec60074cb0475a3e8 (patch)
tree8594f07b462f111de4153fe61bd376fc23a0e90e
parent7876320f88802b22d4e2daf7eb027dd14175a0f8 (diff)
downloadlinux-stable-7401a633c34adc7aefd3edfec60074cb0475a3e8.tar.gz
linux-stable-7401a633c34adc7aefd3edfec60074cb0475a3e8.tar.bz2
linux-stable-7401a633c34adc7aefd3edfec60074cb0475a3e8.zip
x86/mce-inject: Reset injection struct after injection
Clear the MCE struct which is used for collecting the injection details after injection. Also, populate it with more details from the machine. Signed-off-by: Borislav Petkov <bp@suse.de> Link: https://lkml.kernel.org/r/20180905081954.10391-1-bp@alien8.de
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce-inject.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c
index c805a06e14c3..1fc424c40a31 100644
--- a/arch/x86/kernel/cpu/mcheck/mce-inject.c
+++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c
@@ -108,6 +108,9 @@ static void setup_inj_struct(struct mce *m)
memset(m, 0, sizeof(struct mce));
m->cpuvendor = boot_cpu_data.x86_vendor;
+ m->time = ktime_get_real_seconds();
+ m->cpuid = cpuid_eax(1);
+ m->microcode = boot_cpu_data.microcode;
}
/* Update fake mce registers on current CPU. */
@@ -576,6 +579,9 @@ static int inj_bank_set(void *data, u64 val)
m->bank = val;
do_inject();
+ /* Reset injection struct */
+ setup_inj_struct(&i_mce);
+
return 0;
}