summaryrefslogtreecommitdiffstats
path: root/arch/s390/kvm
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-04-07 08:31:44 -0400
committerPaolo Bonzini <pbonzini@redhat.com>2020-04-07 08:31:44 -0400
commit1b0c58a34b4c4e0b010621b21fc38ac2929aa3cb (patch)
treefd212d1063af9adc281ab5d47e4ec09b8eadcb24 /arch/s390/kvm
parent5c8beb474665220374abcafa79e40d78778606d1 (diff)
parent1493e0f944f3c319d11e067c185c904d01c17ae5 (diff)
downloadlinux-1b0c58a34b4c4e0b010621b21fc38ac2929aa3cb.tar.bz2
Merge tag 'kvm-s390-master-5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: s390: Fixes for vsie (nested hypervisors) - Several fixes for corner cases of nesting. Still relevant as it might crash host or first level guest or temporarily leak memory.
Diffstat (limited to 'arch/s390/kvm')
-rw-r--r--arch/s390/kvm/vsie.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c
index 076090f9e666..4f6c22d72072 100644
--- a/arch/s390/kvm/vsie.c
+++ b/arch/s390/kvm/vsie.c
@@ -1202,6 +1202,7 @@ static int vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
scb_s->iprcc = PGM_ADDRESSING;
scb_s->pgmilc = 4;
scb_s->gpsw.addr = __rewind_psw(scb_s->gpsw, 4);
+ rc = 1;
}
return rc;
}