diff options
| author | Thomas Huth | 2014-03-07 12:14:23 +0100 |
|---|---|---|
| committer | Christian Borntraeger | 2014-04-29 15:01:53 +0200 |
| commit | e45efa28e578758d3c5ef0d7d3f88aadb9a61515 (patch) | |
| tree | 309d454abddcc04892a3dadb8b3b7945ffdd0434 /arch/s390 | |
| parent | KVM: s390: Fixes for PFMF (diff) | |
| download | kernel-qcow2-linux-e45efa28e578758d3c5ef0d7d3f88aadb9a61515.tar.gz kernel-qcow2-linux-e45efa28e578758d3c5ef0d7d3f88aadb9a61515.tar.xz kernel-qcow2-linux-e45efa28e578758d3c5ef0d7d3f88aadb9a61515.zip | |
KVM: s390: Add low-address protection to TEST BLOCK
TEST BLOCK is also subject to the low-address protection, so we need
to check the destination address in our handler.
Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kvm/priv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c index a47157bca8a6..07d0c1025cb9 100644 --- a/arch/s390/kvm/priv.c +++ b/arch/s390/kvm/priv.c @@ -206,6 +206,9 @@ static int handle_test_block(struct kvm_vcpu *vcpu) kvm_s390_get_regs_rre(vcpu, NULL, ®2); addr = vcpu->run->s.regs.gprs[reg2] & PAGE_MASK; + addr = kvm_s390_logical_to_effective(vcpu, addr); + if (kvm_s390_check_low_addr_protection(vcpu, addr)) + return kvm_s390_inject_prog_irq(vcpu, &vcpu->arch.pgm); addr = kvm_s390_real_to_abs(vcpu, addr); if (kvm_is_error_gpa(vcpu->kvm, addr)) |