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

Commit 3dc8d7f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

* 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: PIT: free irq source id in handling error path
  KVM: destroy workqueue on kvm_create_pit() failures
  KVM: fix poison overwritten caused by using wrong xstate size
parents 4238a417 6b5d7a9f

arch/x86/kernel/i387.c

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 


static unsigned int		mxcsr_feature_mask __read_mostly = 0xffffffffu;

unsigned int xstate_size;

EXPORT_SYMBOL_GPL(xstate_size);

unsigned int sig_xstate_ia32_size = sizeof(struct _fpstate_ia32);

static struct i387_fxsave_struct fx_scratch __cpuinitdata;

arch/x86/kvm/i8254.c

+2 −1
Original line number Diff line number Diff line
@@ -697,6 +697,7 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm, u32 flags) 
	pit->wq = create_singlethread_workqueue("kvm-pit-wq");

	if (!pit->wq) {

		mutex_unlock(&pit->pit_state.lock);

		kvm_free_irq_source_id(kvm, pit->irq_source_id);

		kfree(pit);

		return NULL;

	}
@@ -742,7 +743,7 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm, u32 flags) 
	kvm_unregister_irq_mask_notifier(kvm, 0, &pit->mask_notifier);

	kvm_unregister_irq_ack_notifier(kvm, &pit_state->irq_ack_notifier);

	kvm_free_irq_source_id(kvm, pit->irq_source_id);



	destroy_workqueue(pit->wq);

	kfree(pit);

	return NULL;

}

arch/x86/kvm/x86.c

+2 −2
Original line number Diff line number Diff line
@@ -2387,7 +2387,7 @@ static void kvm_vcpu_ioctl_x86_get_xsave(struct kvm_vcpu *vcpu, 
	if (cpu_has_xsave)

		memcpy(guest_xsave->region,

			&vcpu->arch.guest_fpu.state->xsave,

			sizeof(struct xsave_struct));

			xstate_size);

	else {

		memcpy(guest_xsave->region,

			&vcpu->arch.guest_fpu.state->fxsave,
@@ -2405,7 +2405,7 @@ static int kvm_vcpu_ioctl_x86_set_xsave(struct kvm_vcpu *vcpu, 


	if (cpu_has_xsave)

		memcpy(&vcpu->arch.guest_fpu.state->xsave,

			guest_xsave->region, sizeof(struct xsave_struct));

			guest_xsave->region, xstate_size);

	else {

		if (xstate_bv & ~XSTATE_FPSSE)

			return -EINVAL;