KVM: x86: Fix NULL dereference at kvm_msr_ignored_check()
PATCH 1/1 KVM: x86: Fix NULL dereference at kvm_msr_ignored_check()
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")
Cc <[email protected]>
Signed-off-by Takashi Iwai <[email protected]>
---
Alternatively, we may fix all vcpu_*() macros to handle NULL vcpu object, too, as mentioned in the bugzilla entry above. If that's a preferred change, let me know. Thanks!
arch/x86/kvm/x86.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/x86/kvm/x86.c +4 -4
@@ -265,13 +265,13 @@ static int kvm_msr_ignored_check(struct kvm_vcpu *vcpu, u32 msr,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 -ENOENT ; } }
Signature · 1 line
2.16.4