diff options
| author |   Radim Krčmář <rkrcmar@redhat.com> | 2019-08-27 14:46:17 +0200 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2019-08-27 16:02:48 +0200 |
| commit | c91ff72142b0500a3835b18a3ed9c8dd7490e5c6 (patch) | |
| tree | 6d523e158bbe1f9fbc38dd5cba4ea2bd0ce09895 /arch | |
| parent | Linux 5.3-rc6 (diff) | |
| parent | KVM: PPC: Book3S: Fix incorrect guest-to-user-translation error handling (diff) | |
| download | linux-dev-c91ff72142b0500a3835b18a3ed9c8dd7490e5c6.tar.xz linux-dev-c91ff72142b0500a3835b18a3ed9c8dd7490e5c6.zip | |
Merge tag 'kvm-ppc-fixes-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
KVM/PPC fix for 5.3
- Fix bug which could leave locks locked in the host on return
to a guest.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kvm/book3s_64_vio.c | 6 | ||||
| -rw-r--r-- | arch/powerpc/kvm/book3s_64_vio_hv.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/arch/powerpc/kvm/book3s_64_vio.c b/arch/powerpc/kvm/book3s_64_vio.c index e99a14798ab0..c4b606fe73eb 100644 --- a/arch/powerpc/kvm/book3s_64_vio.c +++ b/arch/powerpc/kvm/book3s_64_vio.c @@ -660,8 +660,10 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu, } tce = be64_to_cpu(tce); - if (kvmppc_tce_to_ua(vcpu->kvm, tce, &ua)) - return H_PARAMETER; + if (kvmppc_tce_to_ua(vcpu->kvm, tce, &ua)) { + ret = H_PARAMETER; + goto unlock_exit; + } list_for_each_entry_lockless(stit, &stt->iommu_tables, next) { ret = kvmppc_tce_iommu_map(vcpu->kvm, stt, diff --git a/arch/powerpc/kvm/book3s_64_vio_hv.c b/arch/powerpc/kvm/book3s_64_vio_hv.c index f50bbeedfc66..b4f20f13b860 100644 --- a/arch/powerpc/kvm/book3s_64_vio_hv.c +++ b/arch/powerpc/kvm/book3s_64_vio_hv.c @@ -556,8 +556,10 @@ long kvmppc_rm_h_put_tce_indirect(struct kvm_vcpu *vcpu, unsigned long tce = be64_to_cpu(((u64 *)tces)[i]); ua = 0; - if (kvmppc_rm_tce_to_ua(vcpu->kvm, tce, &ua, NULL)) - return H_PARAMETER; + if (kvmppc_rm_tce_to_ua(vcpu->kvm, tce, &ua, NULL)) { + ret = H_PARAMETER; + goto unlock_exit; + } list_for_each_entry_lockless(stit, &stt->iommu_tables, next) { ret = kvmppc_rm_tce_iommu_map(vcpu->kvm, stt, |