| From d383b3146d805a743658225c8973f5d38c6fedf4 Mon Sep 17 00:00:00 2001 |
| From: Takashi Iwai <tiwai@suse.de> |
| Date: Fri, 30 Oct 2020 16:14:14 +0100 |
| Subject: KVM: x86: Fix NULL dereference at kvm_msr_ignored_check() |
| |
| From: Takashi Iwai <tiwai@suse.de> |
| |
| commit d383b3146d805a743658225c8973f5d38c6fedf4 upstream. |
| |
| The newly introduced kvm_msr_ignored_check() tries to print error or |
| debug messages via vcpu_*() macros, but those may cause Oops when NULL |
| vcpu is passed for KVM_GET_MSRS ioctl. |
| |
| Fix it by replacing the print calls with kvm_*() macros. |
| |
| (Note that this will leave vcpu argument completely unused in the |
| function, but I didn't touch it to make the fix as small as |
| possible. A clean up may be applied later.) |
| |
| Fixes: 12bc2132b15e ("KVM: X86: Do the same ignore_msrs check for feature msrs") |
| BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1178280 |
| Cc: <stable@vger.kernel.org> |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Message-Id: <20201030151414.20165-1-tiwai@suse.de> |
| Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/x86/kvm/x86.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/arch/x86/kvm/x86.c |
| +++ b/arch/x86/kvm/x86.c |
| @@ -259,13 +259,13 @@ static int kvm_msr_ignored_check(struct |
| |
| if (ignore_msrs) { |
| if (report_ignored_msrs) |
| - vcpu_unimpl(vcpu, "ignored %s: 0x%x data 0x%llx\n", |
| - op, msr, data); |
| + kvm_pr_unimpl("ignored %s: 0x%x data 0x%llx\n", |
| + op, msr, data); |
| /* Mask the error */ |
| return 0; |
| } else { |
| - vcpu_debug_ratelimited(vcpu, "unhandled %s: 0x%x data 0x%llx\n", |
| - op, msr, data); |
| + kvm_debug_ratelimited("unhandled %s: 0x%x data 0x%llx\n", |
| + op, msr, data); |
| return 1; |
| } |
| } |
