diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-31 18:51:48 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-31 18:51:48 +0300 |
| commit | 834354f642adfe7bb6d5dba5f7de6ecd3150fb2f (patch) | |
| tree | ef824934e0254ca9acf7e406ef497d9235c4c43c /arch/powerpc/kvm/book3s_64_vio_hv.c | |
| parent | 31bb5feb0d2809e60f0f27dc7703417129b814bf (diff) | |
| parent | 75ee23b30dc712d80d2421a9a547e7ab6e379b44 (diff) | |
| download | linux-834354f642adfe7bb6d5dba5f7de6ecd3150fb2f.tar.xz | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Radim Krčmář:
"PPC:
- Fix bug which could leave locks held in the host on return to a
guest.
x86:
- Prevent infinitely looping emulation of a failing syscall while
single stepping.
- Do not crash the host when nesting is disabled"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: x86: Don't update RIP or do single-step on faulting emulation
KVM: x86: hyper-v: don't crash on KVM_GET_SUPPORTED_HV_CPUID when kvm_intel.nested is disabled
KVM: PPC: Book3S: Fix incorrect guest-to-user-translation error handling
Diffstat (limited to 'arch/powerpc/kvm/book3s_64_vio_hv.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s_64_vio_hv.c | 6 |
1 files changed, 4 insertions, 2 deletions
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, |