KVM: s390: fix signal handling

If signal pending is true we exit without updating kvm_run, userspace
currently just does nothing and jumps to kvm_run again.
Since we did not set an exit_reason we might end up with a random one
(whatever was the last exit). Therefore it was possible to e.g. jump to
the psw position the last real interruption set.
Setting the INTR exit reason ensures that no old psw data is swapped
in on reentry.

Signed-off-by: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 1d65f627716618fc65e137e2ac93eb6525e656ef..5c1c3025900292cbd30bcd83dd260814dc7c1353 100644 (file)
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -527,8 +527,10 @@ rerun_vcpu:
        if (rc == SIE_INTERCEPT_RERUNVCPU)
                goto rerun_vcpu;
 
-       if (signal_pending(current) && !rc)
+       if (signal_pending(current) && !rc) {
+               kvm_run->exit_reason = KVM_EXIT_INTR;
                rc = -EINTR;
+       }
 
        if (rc == -ENOTSUPP) {
                /* intercept cannot be handled in-kernel, prepare kvm-run */