KVM: x86: Take PIC lock on KVM_GET_IRQCHIP path
PATCH v2 1/1 KVM: x86: Take PIC lock on KVM_GET_IRQCHIP path
When userspace issues the KVM_SET_IRQCHIP ioctl to set the state of the PIC, kvm_vm_ioctl_set_irqchip() grabs @kvm->arch.vpic->lock before updating the state. However, the KVM_GET_IRQCHIP ioctl to retrieve the same PIC state does not grab such lock, potentially causing torn reads for userspace.
Fix this by grabbing the lock on the read path.
This issue goes all the way back. The bug was introduced with the addition of PIC ioctl code itself in 6ceb9d791eee ("KVM: Add get/ set irqchip ioctls for in-kernel PIC live migration support"). Later, 894a9c5543ab ("KVM: x86: missing locking in PIT/IRQCHIP/SET_BSP_CPU ioctl paths") added the locking for kvm_vm_ioctl_set_irqchip(), but missed kvm_vm_ioctl_get_irqchip().
---
v2:
- Remove stable tag
- Use regular locking instead of guards
arch/x86/kvm/irq.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/x86/kvm/irq.c +4 -0
@@ -585,12 +585,16 @@ int kvm_vm_ioctl_get_irqchip(struct kvm *kvm, struct kvm_irqchip *chip) r =0 ;switch (chip->chip_id) {case KVM_IRQCHIP_PIC_MASTER : +spin_lock (&pic->lock);memcpy (&chip->chip.pic, &pic->pics[0 ],sizeof (struct kvm_pic_state )); +spin_unlock (&pic->lock);break ;case KVM_IRQCHIP_PIC_SLAVE : +spin_lock (&pic->lock);memcpy (&chip->chip.pic, &pic->pics[1 ],sizeof (struct kvm_pic_state )); +spin_unlock (&pic->lock);break ;case KVM_IRQCHIP_IOAPIC :kvm_get_ioapic (kvm, &chip->chip.ioapic);
base-commit: d1568b1332b6b3b36b222c2868fc102727c12a34
Signature · 1 line
2.51.0
Quoted 9 lines · Carlos López
When userspace issues the
KVM_SET_IRQCHIPioctl to set the state of the PIC,kvm_vm_ioctl_set_irqchip()grabs @kvm->arch.vpic->lock before updating the state. However, theKVM_GET_IRQCHIPioctl to retrieve the same PIC state does not grab such lock, potentially causing torn reads for userspace.Fix this by grabbing the lock on the read path.
[...]
Applied to kvm-x86 misc, thanks!
[1/1] KVM: x86: Take PIC lock on KVM_GET_IRQCHIP path
https://github.com/kvm-x86/linux/commit/376e11855154