KVM: x86: missing locking in PIT/IRQCHIP/SET_BSP_CPU ioctl paths
Correct missing locking in a few places in x86's vm_ioctl handling path.
Signed-off-by Marcelo Tosatti <[email protected]>
arch/x86/kvm/x86.c +12 -0
@@ -1951,19 +1951,25 @@ static int kvm_vm_ioctl_set_irqchip(stru r =0 ;switch (chip->chip_id) {case KVM_IRQCHIP_PIC_MASTER : +spin_lock (&pic_irqchip (kvm)->lock);memcpy (&pic_irqchip (kvm)->pics[0 ], &chip->chip.pic,sizeof (struct kvm_pic_state )); +spin_unlock (&pic_irqchip (kvm)->lock);break ;case KVM_IRQCHIP_PIC_SLAVE : +spin_lock (&pic_irqchip (kvm)->lock);memcpy (&pic_irqchip (kvm)->pics[1 ], &chip->chip.pic,sizeof (struct kvm_pic_state )); +spin_unlock (&pic_irqchip (kvm)->lock);break ;case KVM_IRQCHIP_IOAPIC : +mutex_lock (&kvm->irq_lock);memcpy (ioapic_irqchip (kvm), &chip->chip.ioapic,sizeof (struct kvm_ioapic_state )); +mutex_unlock (&kvm->irq_lock);break ;default : r = -EINVAL ;
@@ -1977,7 +1983,9 @@ static int kvm_vm_ioctl_get_pit(struct k {int r =0 ; +mutex_lock (&kvm->arch.vpit->pit_state.lock);memcpy (ps, &kvm->arch.vpit->pit_state,sizeof (struct kvm_pit_state )); +mutex_unlock (&kvm->arch.vpit->pit_state.lock);return r; }
@@ -1985,8 +1993,10 @@ static int kvm_vm_ioctl_set_pit(struct k {int r =0 ; +mutex_lock (&kvm->arch.vpit->pit_state.lock);memcpy (&kvm->arch.vpit->pit_state, ps,sizeof (struct kvm_pit_state ));kvm_pit_load_count (kvm,0 , ps->channels[0 ].count); +mutex_unlock (&kvm->arch.vpit->pit_state.lock);return r; }
@@ -1995,7 +2005,9 @@ static int kvm_vm_ioctl_reinject(struct {if (!kvm->arch.vpit)return -ENXIO ; +mutex_lock (&kvm->arch.vpit->pit_state.lock); kvm->arch.vpit->pit_state.pit_timer.reinject = control->pit_reinject; +mutex_unlock (&kvm->arch.vpit->pit_state.lock);return 0 ; }
arch/x86/kvm/i8254.c +0 -2
@@ -342,9 +342,7 @@ static void pit_load_count(struct kvm *kvoid kvm_pit_load_count (struct kvm *kvm,int channel,u32 val) { -mutex_lock (&kvm->arch.vpit->pit_state.lock);pit_load_count (kvm, channel, val); -mutex_unlock (&kvm->arch.vpit->pit_state.lock); }static inline struct kvm_pit *dev_to_pit (struct kvm_io_device *dev)
virt/kvm/kvm_main.c +2 -0
@@ -2248,10 +2248,12 @@ static long kvm_vm_ioctl(struct file *fi#ifdef CONFIG_KVM_APIC_ARCHITECTURE case KVM_SET_BOOT_CPU_ID : r =0 ; +mutex_lock (&kvm->lock);if (atomic_read (&kvm->online_vcpus) !=0 ) r = -EBUSY ;else kvm->bsp_vcpu_id = arg; +mutex_unlock (&kvm->lock);break ;#endif default :
Avi Kivity
AppliedQuoted 3 lines · Marcelo Tosatti
Correct missing locking in a few places in x86's
vm_ioctlhandling path.
Applied, thanks.
Signature · 1 line
error compiling committee.c: too many arguments to function