KVM: x86: Handle SRCU initialization failure during page track init
Subsystems (2)
Sasha Levin
maintainerPATCH 1/2 KVM: x86: Handle SRCU initialization failure during page track init
From: Haimin Zhang <[email protected]>
[ Upstream commit eb7511bf9182292ef1df1082d23039e856d1ddfb ]
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.
Message-Id: <[email protected]>
--- arch/x86/include/asm/kvm_page_track.h | 2 +- arch/x86/kvm/page_track.c | 4 ++-- arch/x86/kvm/x86.c | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-)
arch/x86/include/asm/kvm_page_track.h +1 -1
@@ -46,7 +46,7 @@ struct kvm_page_track_notifier_node { struct kvm_page_track_notifier_node *node); }; -void kvm_page_track_init (struct kvm *kvm); +int kvm_page_track_init (struct kvm *kvm);void kvm_page_track_cleanup (struct kvm *kvm); void kvm_page_track_free_memslot(struct kvm_memory_slot *free,
arch/x86/kvm/page_track.c +2 -2
@@ -169,13 +169,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); }/*
arch/x86/kvm/x86.c +6 -1
@@ -9039,9 +9039,15 @@ void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu)int kvm_arch_init_vm (struct kvm *kvm,unsigned long type) { +int ret; +if (type)return -EINVAL ; + ret =kvm_page_track_init (kvm); +if (ret) +return ret; +INIT_HLIST_HEAD (&kvm->arch.mask_notifier_list);INIT_LIST_HEAD (&kvm->arch.active_mmu_pages);INIT_LIST_HEAD (&kvm->arch.zapped_obsolete_pages);
@@ -9068,7 +9074,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)INIT_DELAYED_WORK (&kvm->arch.kvmclock_sync_work, kvmclock_sync_fn);kvm_hv_init_vm (kvm); -kvm_page_track_init (kvm);kvm_mmu_init_vm (kvm);if (kvm_x86_ops->vm_init)
Signature · 1 line
2.33.0
Sasha Levin
maintainerPATCH 2/2 ALSA: pcsp: Make hrtimer forwarding more robust
From: Thomas Gleixner <[email protected]>
[ Upstream commit f2ff7147c6834f244b8ce636b12e71a3bd044629 ]
The hrtimer callback pcsp_do_timer() prepares rearming of the timer with hrtimer_forward(). hrtimer_forward() is intended to provide a mechanism to forward the expiry time of the hrtimer by a multiple of the period argument so that the expiry time greater than the time provided in the 'now' argument.
pcsp_do_timer() invokes hrtimer_forward() with the current timer expiry time as 'now' argument. That's providing a periodic timer expiry, but is not really robust when the timer callback is delayed so that the resulting new expiry time is already in the past which causes the callback to be invoked immediately again. If the timer is delayed then the back to back invocation is not really making it better than skipping the missed periods. Sound is distorted in any case.
Use hrtimer_forward_now() which ensures that the next expiry is in the future. This prevents hogging the CPU in the timer expiry code and allows later on to remove hrtimer_forward() from the public interfaces.
--- sound/drivers/pcsp/pcsp_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/drivers/pcsp/pcsp_lib.c +1 -1
@@ -145,7 +145,7 @@ enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle)if (pointer_update)pcsp_pointer_update (chip); -hrtimer_forward (handle,hrtimer_get_expires (handle),ns_to_ktime (ns)); +hrtimer_forward_now (handle,ns_to_ktime (ns));return HRTIMER_RESTART ; }
Signature · 1 line
2.33.0
Quoted 75 lines · Sasha Levin
From: Haimin Zhang <[email protected]>
[ Upstream commit
eb7511bf9182292ef1df1082d23039e856d1ddfb]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 <[email protected]>Signed-off-by Haimin Zhang <[email protected]>Message-Id: <[email protected]>
[Move the call towards the beginning of kvm_arch_init_vm. - Paolo]Signed-off-by Paolo Bonzini <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- arch/x86/include/asm/kvm_page_track.h | 2 +- arch/x86/kvm/page_track.c | 4 ++-- arch/x86/kvm/x86.c | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-)arch/x86/include/asm/kvm_page_track.h +1
-1@@ -46,7 +46,7 @@ struct kvm_page_track_notifier_node { struct kvm_page_track_notifier_node *node); }; -void kvm_page_track_init (struct kvm *kvm); +int kvm_page_track_init (struct kvm *kvm);void kvm_page_track_cleanup (struct kvm *kvm); void kvm_page_track_free_memslot(struct kvm_memory_slot *free,arch/x86/kvm/page_track.c +2
-2@@ -169,13 +169,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); }/* arch/x86/kvm/x86.c +6
-0@@ -9039,9 +9039,15 @@ void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu)int kvm_arch_init_vm (struct kvm *kvm,unsigned long type) { +int ret; +if (type)return -EINVAL ; + ret =kvm_page_track_init (kvm); +if (ret) +return ret; +INIT_HLIST_HEAD (&kvm->arch.mask_notifier_list);INIT_LIST_HEAD (&kvm->arch.active_mmu_pages);INIT_LIST_HEAD (&kvm->arch.zapped_obsolete_pages);
arch/x86/kvm/x86.c int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) · line 9079
Quoted 7 lines
arch/x86/kvm/x86.c +0
-1@@ -9068,7 +9074,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)INIT_DELAYED_WORK (&kvm->arch.kvmclock_sync_work, kvmclock_sync_fn);kvm_hv_init_vm (kvm); -kvm_page_track_init (kvm);kvm_mmu_init_vm (kvm);if (kvm_x86_ops->vm_init)
Quoted 9 lines · Paolo Bonzini
Quoted 8 lines · Sasha Levin
From: Haimin Zhang <[email protected]>
[ Upstream commit
eb7511bf9182292ef1df1082d23039e856d1ddfb]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.
Quoted 8 lines
Quoted 6 lines
Reported-by TCS Robot <[email protected]>Signed-off-by Haimin Zhang <[email protected]>Message-Id: <[email protected]>
[Move the call towards the beginning of kvm_arch_init_vm. - Paolo]Signed-off-by Paolo Bonzini <[email protected]>Signed-off-by Sasha Levin <[email protected]>Acked-by Paolo Bonzini <[email protected]>
Sasha, will this patch be applied for 4.19?
The same question for the 5.4 backport [*]. It looks like both of them are missed for unknown reasons.
Greg KH
maintainerQuoted 17 lines · Zenghui Yu
Quoted 16 lines · Paolo Bonzini
Quoted 14 lines · Sasha Levin
From: Haimin Zhang <[email protected]>
[ Upstream commit
eb7511bf9182292ef1df1082d23039e856d1ddfb]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 <[email protected]>Signed-off-by Haimin Zhang <[email protected]>Message-Id: <[email protected]>
[Move the call towards the beginning of kvm_arch_init_vm. - Paolo]Signed-off-by Paolo Bonzini <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 8 lines
Quoted 1 line
Acked-by Paolo Bonzini <[email protected]>Sasha, will this patch be applied for 4.19?
The same question for the 5.4 backport [*]. It looks like both of them are missed for unknown reasons.
This was from 2021, quite a while ago.
Can you please send them in backported form if you feel they should be applied?
thanks,
greg k-h