Skip to content

Commit fffb532

Browse files
nikunjadbonzini
authored andcommitted
KVM: x86: Check for rmaps allocation
With TDP MMU being the default now, access to mmu_rmaps_stat debugfs file causes following oops: BUG: kernel NULL pointer dereference, address: 0000000000000000 PGD 0 P4D 0 Oops: 0000 [#1] PREEMPT SMP NOPTI CPU: 7 PID: 3185 Comm: cat Not tainted 5.16.0-rc4+ #204 RIP: 0010:pte_list_count+0x6/0x40 Call Trace: <TASK> ? kvm_mmu_rmaps_stat_show+0x15e/0x320 seq_read_iter+0x126/0x4b0 ? aa_file_perm+0x124/0x490 seq_read+0xf5/0x140 full_proxy_read+0x5c/0x80 vfs_read+0x9f/0x1a0 ksys_read+0x67/0xe0 __x64_sys_read+0x19/0x20 do_syscall_64+0x3b/0xc0 entry_SYSCALL_64_after_hwframe+0x44/0xae RIP: 0033:0x7fca6fc13912 Return early when rmaps are not present. Reported-by: Vasant Hegde <[email protected]> Tested-by: Vasant Hegde <[email protected]> Signed-off-by: Nikunj A Dadhania <[email protected]> Reviewed-by: Peter Xu <[email protected]> Reviewed-by: Sean Christopherson <[email protected]> Message-Id: <[email protected]> Cc: [email protected] Fixes: 3bcd066 ("KVM: X86: Introduce mmu_rmaps_stat per-vm debugfs file") Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 597cb79 commit fffb532

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

Diff for: arch/x86/kvm/debugfs.c

+3
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ static int kvm_mmu_rmaps_stat_show(struct seq_file *m, void *v)
9595
unsigned int *log[KVM_NR_PAGE_SIZES], *cur;
9696
int i, j, k, l, ret;
9797

98+
if (!kvm_memslots_have_rmaps(kvm))
99+
return 0;
100+
98101
ret = -ENOMEM;
99102
memset(log, 0, sizeof(log));
100103
for (i = 0; i < KVM_NR_PAGE_SIZES; i++) {

0 commit comments

Comments
 (0)