]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
KVM: SEV: fix double locking due to incorrect backport
authorPaolo Bonzini <pbonzini@redhat.com>
Thu, 18 Feb 2021 18:40:58 +0000 (13:40 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 23 Feb 2021 14:02:25 +0000 (15:02 +0100)
Fix an incorrect line in the 5.4.y and 4.19.y backports of commit
19a23da53932bc ("Fix unsynchronized access to sev members through
svm_register_enc_region"), first applied to 5.4.98 and 4.19.176.

Fixes: 1e80fdc09d12 ("KVM: SVM: Pin guest memory when SEV is active")
Reported-by: Dov Murik <dovmurik@linux.vnet.ibm.com>
Cc: stable@vger.kernel.org # 5.4.x
Cc: stable@vger.kernel.org # 4.19.x
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/x86/kvm/svm.c

index 296b0d7570d0607955803e6f40e14c8cdb584693..1da558f28aa577cd8d7d737ec7212de4769c590f 100644 (file)
@@ -7104,7 +7104,6 @@ static int svm_register_enc_region(struct kvm *kvm,
        region->uaddr = range->addr;
        region->size = range->size;
 
-       mutex_lock(&kvm->lock);
        list_add_tail(&region->list, &sev->regions_list);
        mutex_unlock(&kvm->lock);