Commit 8e41bd54 authored by Christian Borntraeger's avatar Christian Borntraeger
Browse files

KVM: s390: fix locking for crypto setting error path 



We need to unlock the kvm->lock mutex in the error case.

Reported-by: smatch
Fixes: 37940fb0 ("KVM: s390: device attrs to enable/disable AP interpretation")
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Reviewed-by: default avatarPierre Morel <pmorel@linux.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 492a6be1

arch/s390/kvm/kvm-s390.c

+12 −4
Original line number Diff line number Diff line
@@ -859,8 +859,10 @@ static int kvm_s390_vm_set_crypto(struct kvm *kvm, struct kvm_device_attr *attr) 
	mutex_lock(&kvm->lock);

	switch (attr->attr) {

	case KVM_S390_VM_CRYPTO_ENABLE_AES_KW:

		if (!test_kvm_facility(kvm, 76))

		if (!test_kvm_facility(kvm, 76)) {

			mutex_unlock(&kvm->lock);

			return -EINVAL;

		}

		get_random_bytes(

			kvm->arch.crypto.crycb->aes_wrapping_key_mask,

			sizeof(kvm->arch.crypto.crycb->aes_wrapping_key_mask));
@@ -868,8 +870,10 @@ static int kvm_s390_vm_set_crypto(struct kvm *kvm, struct kvm_device_attr *attr) 
		VM_EVENT(kvm, 3, "%s", "ENABLE: AES keywrapping support");

		break;

	case KVM_S390_VM_CRYPTO_ENABLE_DEA_KW:

		if (!test_kvm_facility(kvm, 76))

		if (!test_kvm_facility(kvm, 76)) {

			mutex_unlock(&kvm->lock);

			return -EINVAL;

		}

		get_random_bytes(

			kvm->arch.crypto.crycb->dea_wrapping_key_mask,

			sizeof(kvm->arch.crypto.crycb->dea_wrapping_key_mask));
@@ -877,16 +881,20 @@ static int kvm_s390_vm_set_crypto(struct kvm *kvm, struct kvm_device_attr *attr) 
		VM_EVENT(kvm, 3, "%s", "ENABLE: DEA keywrapping support");

		break;

	case KVM_S390_VM_CRYPTO_DISABLE_AES_KW:

		if (!test_kvm_facility(kvm, 76))

		if (!test_kvm_facility(kvm, 76)) {

			mutex_unlock(&kvm->lock);

			return -EINVAL;

		}

		kvm->arch.crypto.aes_kw = 0;

		memset(kvm->arch.crypto.crycb->aes_wrapping_key_mask, 0,

			sizeof(kvm->arch.crypto.crycb->aes_wrapping_key_mask));

		VM_EVENT(kvm, 3, "%s", "DISABLE: AES keywrapping support");

		break;

	case KVM_S390_VM_CRYPTO_DISABLE_DEA_KW:

		if (!test_kvm_facility(kvm, 76))

		if (!test_kvm_facility(kvm, 76)) {

			mutex_unlock(&kvm->lock);

			return -EINVAL;

		}

		kvm->arch.crypto.dea_kw = 0;

		memset(kvm->arch.crypto.crycb->dea_wrapping_key_mask, 0,

			sizeof(kvm->arch.crypto.crycb->dea_wrapping_key_mask));

CRA Git | Maintained and supported by SUSTech CRA and CCSE