summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaolo Bonzini2018-05-17 19:22:59 +0200
committerPaolo Bonzini2018-05-17 19:22:59 +0200
commite20ac8b11b0f06ebae63c56062123b62b0c64c2b (patch)
tree12771d1f8d24881796e12ffe362bbeeec3e90d29
parentkvm: rename KVM_HINTS_DEDICATED to KVM_HINTS_REALTIME (diff)
parentKVM: s390: vsie: fix < 8k check for the itdba (diff)
downloadkernel-qcow2-linux-e20ac8b11b0f06ebae63c56062123b62b0c64c2b.tar.gz
kernel-qcow2-linux-e20ac8b11b0f06ebae63c56062123b62b0c64c2b.tar.xz
kernel-qcow2-linux-e20ac8b11b0f06ebae63c56062123b62b0c64c2b.zip
Merge tag 'kvm-s390-master-4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master
KVM: s390: Fix vsie handling for transactional diagnostic block vsie (nested KVM) might reject a valid input. Fix it.
-rw-r--r--arch/s390/kvm/vsie.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c
index 8961e3970901..969882b54266 100644
--- a/arch/s390/kvm/vsie.c
+++ b/arch/s390/kvm/vsie.c
@@ -578,7 +578,7 @@ static int pin_blocks(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
gpa = READ_ONCE(scb_o->itdba) & ~0xffUL;
if (gpa && (scb_s->ecb & ECB_TE)) {
- if (!(gpa & ~0x1fffU)) {
+ if (!(gpa & ~0x1fffUL)) {
rc = set_validity_icpt(scb_s, 0x0080U);
goto unpin;
}