Skip to content

Commit 51dddf6

Browse files
Lai Jiangshansean-jc
authored andcommitted
KVM: x86/mmu: Check mmu->sync_page pointer in kvm_sync_page_check()
Assert that mmu->sync_page is non-NULL as part of the sanity checks performed before attempting to sync a shadow page. Explicitly checking mmu->sync_page is all but guaranteed to be redundant with the existing sanity check that the MMU is indirect, but the cost is negligible, and the explicit check also serves as documentation. Signed-off-by: Lai Jiangshan <jiangshan.ljs@antgroup.com> Link: https://lore.kernel.org/r/20230216154115.710033-4-jiangshanlai@gmail.com [sean: increase verbosity of changelog] Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 90e4447 commit 51dddf6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/kvm/mmu/mmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1940,7 +1940,7 @@ static bool kvm_sync_page_check(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp)
19401940
* differs then the memslot lookup (SMM vs. non-SMM) will be bogus, the
19411941
* reserved bits checks will be wrong, etc...
19421942
*/
1943-
if (WARN_ON_ONCE(sp->role.direct ||
1943+
if (WARN_ON_ONCE(sp->role.direct || !vcpu->arch.mmu->sync_page ||
19441944
(sp->role.word ^ root_role.word) & ~sync_role_ign.word))
19451945
return false;
19461946

0 commit comments

Comments
 (0)