diff options
| author |   Haimin Zhang <tcs_kernel@tencent.com> | 2021-09-03 10:37:06 +0800 |
|---|---|---|
| committer |   Paolo Bonzini <pbonzini@redhat.com> | 2021-09-22 10:33:09 -0400 |
| commit | eb7511bf9182292ef1df1082d23039e856d1ddfb (patch) | |
| tree | d9bf754f850145f0268049a1b291ab385f0005c8 /arch/x86/kvm/mmu/page_track.c | |
| parent | KVM: VMX: Remove defunct "nr_active_uret_msrs" field (diff) | |
| download | wireguard-linux-eb7511bf9182292ef1df1082d23039e856d1ddfb.tar.xz wireguard-linux-eb7511bf9182292ef1df1082d23039e856d1ddfb.zip | |
KVM: x86: Handle SRCU initialization failure during page track init
Check the return of init_srcu_struct(), which can fail due to OOM, when
initializing the page track mechanism. Lack of checking leads to a NULL
pointer deref found by a modified syzkaller.
Reported-by: TCS Robot <tcs_robot@tencent.com>
Signed-off-by: Haimin Zhang <tcs_kernel@tencent.com>
Message-Id: <1630636626-12262-1-git-send-email-tcs_kernel@tencent.com>
[Move the call towards the beginning of kvm_arch_init_vm. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/mmu/page_track.c')
| -rw-r--r-- | arch/x86/kvm/mmu/page_track.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/mmu/page_track.c b/arch/x86/kvm/mmu/page_track.c index 269f11f92fd0..21427e84a82e 100644 --- a/arch/x86/kvm/mmu/page_track.c +++ b/arch/x86/kvm/mmu/page_track.c @@ -164,13 +164,13 @@ void kvm_page_track_cleanup(struct kvm *kvm) cleanup_srcu_struct(&head->track_srcu); } -void kvm_page_track_init(struct kvm *kvm) +int kvm_page_track_init(struct kvm *kvm) { struct kvm_page_track_notifier_head *head; head = &kvm->arch.track_notifier_head; - init_srcu_struct(&head->track_srcu); INIT_HLIST_HEAD(&head->track_notifier_list); + return init_srcu_struct(&head->track_srcu); } /* |