From: Sean Christopherson Date: Thu, 4 Feb 2021 00:01:11 +0000 (-0800) Subject: KVM: nSVM: Use common GPA helper to check for illegal CR3 X-Git-Tag: v6.6-pxa1908~7115^2~47 X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=bbc2c63ddd51cd6d349e3fe0010f9b7b259e58ea;p=linux.git KVM: nSVM: Use common GPA helper to check for illegal CR3 Replace an open coded check for an invalid CR3 with its equivalent helper. No functional change intended. Signed-off-by: Sean Christopherson Message-Id: <20210204000117.3303214-7-seanjc@google.com> Signed-off-by: Paolo Bonzini --- diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index 69188897cae2..1055b7d0012b 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -345,7 +345,7 @@ static inline bool nested_npt_enabled(struct vcpu_svm *svm) static int nested_svm_load_cr3(struct kvm_vcpu *vcpu, unsigned long cr3, bool nested_npt) { - if (cr3 & rsvd_bits(cpuid_maxphyaddr(vcpu), 63)) + if (kvm_vcpu_is_illegal_gpa(vcpu, cr3)) return -EINVAL; if (!nested_npt && is_pae_paging(vcpu) &&