The following commit has been merged into the x86/misc branch of tip: Commit-ID: c31feed8461fb8648075ba9b53d9e527d530972f Gitweb: https://git.kernel.org/tip/c31feed8461fb8648075ba9b53d9e527d530972f Author: Chris Down <chris@xxxxxxxxxxxxxx> AuthorDate: Fri, 21 Aug 2020 13:10:35 +01:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Sat, 22 Aug 2020 11:40:38 +02:00 x86/msr: Make source of unrecognised MSR writes unambiguous In many cases, task_struct.comm isn't enough to distinguish the offender, since for interpreted languages it's likely just going to be "python3" or whatever. Add the pid to make it unambiguous. [ bp: Make the printk string a single line for easier grepping. ] Signed-off-by: Chris Down <chris@xxxxxxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Link: https://lkml.kernel.org/r/6f6fbd0ee6c99bc5e47910db700a6642159db01b.1598011595.git.chris@xxxxxxxxxxxxxx --- arch/x86/kernel/msr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c index b03001d..c0d4098 100644 --- a/arch/x86/kernel/msr.c +++ b/arch/x86/kernel/msr.c @@ -102,8 +102,8 @@ static int filter_write(u32 reg) if (reg == MSR_IA32_ENERGY_PERF_BIAS) return 0; - pr_err("Write to unrecognized MSR 0x%x by %s\n" - "Please report to x86@xxxxxxxxxx\n", reg, current->comm); + pr_err("Write to unrecognized MSR 0x%x by %s (pid: %d). Please report to x86@xxxxxxxxxx.\n", + reg, current->comm, current->pid); return 0; }