Messages in this thread | | | From | Vitaly Kuznetsov <> | Subject | Re: [PATCH 2/2] KVM: X86: Fix null pointer reference for KVM_GET_MSRS | Date | Mon, 26 Oct 2020 10:07:27 +0100 |
| |
Peter Xu <peterx@redhat.com> writes:
> kvm_msr_ignored_check() could trigger a null pointer reference
'dereference' but I'd also clarify that 'vcpu' is NULL.
> if ignore_msrs=Y > and report_ignore_msrs=Y when try to fetch an invalid feature msr using the > global KVM_GET_MSRS. Degrade the error report to not rely on vcpu since that > information (index, rip) is not as important as msr index/data after all. > > Fixes: 12bc2132b15e0a96
Fixes: 12bc2132b15e ("KVM: X86: Do the same ignore_msrs check for feature msrs")
please (checkpatch.pl should've complained I guess)
> Reported-by: Steffen Dirkwinkel <kernel-bugs@steffen.cc> > Signed-off-by: Peter Xu <peterx@redhat.com> > --- > arch/x86/kvm/x86.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index ce856e0ece84..5993fbd6d2c5 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -259,8 +259,8 @@ 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);
I would've preserved vcpu version for non-gloal cases, e.g.
if (report_ignored_msrs) { if (vcpu) vcpu_unimpl(vcpu, "ignored %s: 0x%x data 0x%llx\n", op, msr, data); else kvm_pr_unimpl("ignored %s: 0x%x data 0x%llx\n", op, msr, data); }
> /* Mask the error */ > return 0; > } else {
-- Vitaly
| |