From: Thomas Huth <th...@linux.vnet.ibm.com>

When a guest calls the TPI instruction, the second operand address could
point to an invalid location. In this case the problem should be signaled
to the guest by throwing an access exception.

Signed-off-by: Thomas Huth <th...@linux.vnet.ibm.com>
Acked-by: Cornelia Huck <cornelia.h...@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.h...@de.ibm.com>
---
 arch/s390/kvm/priv.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index 0b19e22..4b8fb6c 100644
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -146,9 +146,10 @@ static int handle_tpi(struct kvm_vcpu *vcpu)
                 * Store the two-word I/O interruption code into the
                 * provided area.
                 */
-               put_guest(vcpu, inti->io.subchannel_id, (u16 __user *) addr);
-               put_guest(vcpu, inti->io.subchannel_nr, (u16 __user *) (addr + 
2));
-               put_guest(vcpu, inti->io.io_int_parm, (u32 __user *) (addr + 
4));
+               if (put_guest(vcpu, inti->io.subchannel_id, (u16 __user *)addr)
+                   || put_guest(vcpu, inti->io.subchannel_nr, (u16 __user 
*)(addr + 2))
+                   || put_guest(vcpu, inti->io.io_int_parm, (u32 __user 
*)(addr + 4)))
+                       return kvm_s390_inject_program_int(vcpu, 
PGM_ADDRESSING);
        } else {
                /*
                 * Store the three-word I/O interruption code into
-- 
1.8.2.2

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to