Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4aa675aa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM fixes from Radim Krčmář:
 "All architectures avoid memory corruption in an error path. ARM
  prevents bogus acknowledgement of interrupts"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: use after free in kvm_ioctl_create_device()
  KVM: arm/arm64: vgic: Don't notify EOI for non-SPIs
parents 3e52d063 a0f1d21c

virt/kvm/arm/vgic/vgic-v2.c

+4 −2
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ void vgic_v2_process_maintenance(struct kvm_vcpu *vcpu) 


			WARN_ON(cpuif->vgic_lr[lr] & GICH_LR_STATE);



			/* Only SPIs require notification */

			if (vgic_valid_spi(vcpu->kvm, intid))

				kvm_notify_acked_irq(vcpu->kvm, 0,

						     intid - VGIC_NR_PRIVATE_IRQS);

		}

virt/kvm/arm/vgic/vgic-v3.c

+4 −2
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ void vgic_v3_process_maintenance(struct kvm_vcpu *vcpu) 


			WARN_ON(cpuif->vgic_lr[lr] & ICH_LR_STATE);



			/* Only SPIs require notification */

			if (vgic_valid_spi(vcpu->kvm, intid))

				kvm_notify_acked_irq(vcpu->kvm, 0,

						     intid - VGIC_NR_PRIVATE_IRQS);

		}

virt/kvm/kvm_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2889,10 +2889,10 @@ static int kvm_ioctl_create_device(struct kvm *kvm, 


	ret = anon_inode_getfd(ops->name, &kvm_device_fops, dev, O_RDWR | O_CLOEXEC);

	if (ret < 0) {

		ops->destroy(dev);

		mutex_lock(&kvm->lock);

		list_del(&dev->vm_node);

		mutex_unlock(&kvm->lock);

		ops->destroy(dev);

		return ret;

	}