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

Commit 82a12737 authored by Jason J. Herne's avatar Jason J. Herne Committed by Marcelo Tosatti
Browse files

s390/kvm: Interrupt injection bugfix 



EXTERNAL_CALL and EMERGENCY type interrupts need to preserve their interrupt
code parameter when being injected from user space.

Signed-off-by: default avatarJason J. Herne <jjherne@us.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent d151f63f

arch/s390/kvm/interrupt.c

+18 −1
Original line number Diff line number Diff line
@@ -629,10 +629,27 @@ int kvm_s390_inject_vcpu(struct kvm_vcpu *vcpu, 
		break;

	case KVM_S390_SIGP_STOP:

	case KVM_S390_RESTART:

		VCPU_EVENT(vcpu, 3, "inject: type %x", s390int->type);

		inti->type = s390int->type;

		break;

	case KVM_S390_INT_EXTERNAL_CALL:

		if (s390int->parm & 0xffff0000) {

			kfree(inti);

			return -EINVAL;

		}

		VCPU_EVENT(vcpu, 3, "inject: external call source-cpu:%u",

			   s390int->parm);

		inti->type = s390int->type;

		inti->extcall.code = s390int->parm;

		break;

	case KVM_S390_INT_EMERGENCY:

		VCPU_EVENT(vcpu, 3, "inject: type %x", s390int->type);

		if (s390int->parm & 0xffff0000) {

			kfree(inti);

			return -EINVAL;

		}

		VCPU_EVENT(vcpu, 3, "inject: emergency %u\n", s390int->parm);

		inti->type = s390int->type;

		inti->emerg.code = s390int->parm;

		break;

	case KVM_S390_INT_VIRTIO:

	case KVM_S390_INT_SERVICE: