On 04/10/2018 21:39, Christian Borntraeger wrote:
> We need to unlock the kvm->lock mutex in the error case.
>
> Reported-by: smatch
> Fixes: 37940fb0b6a2c4bf101 ("KVM: s390: device attrs to enable/disable AP interpretation")
> Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx>
> Reviewed-by: Janosch Frank <frankja@xxxxxxxxxxxxx>
> Reviewed-by: Pierre Morel <pmorel@xxxxxxxxxxxxx>
> ---
> arch/s390/kvm/kvm-s390.c | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
> index b7964d77c6cd..80652907d3d8 100644
> --- a/arch/s390/kvm/kvm-s390.c
> +++ b/arch/s390/kvm/kvm-s390.c
> @@ -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));
>
Reviewed-by: David Hildenbrand <david@xxxxxxxxxx>
--
Thanks,
David / dhildenb
