Commit 85f517b2 authored by Janis Schoetterl-Glausch's avatar Janis Schoetterl-Glausch Committed by Christian Borntraeger
Browse files

KVM: s390: Fix handle_sske page fault handling 



If handle_sske cannot set the storage key, because there is no
page table entry or no present large page entry, it calls
fixup_user_fault.
However, currently, if the call succeeds, handle_sske returns
-EAGAIN, without having set the storage key.
Instead, retry by continue'ing the loop without incrementing the
address.
The same issue in handle_pfmf was fixed by
a11bdb1a ("KVM: s390: Fix pfmf and conditional skey emulation").

Fixes: bd096f64 ("KVM: s390: Add skey emulation fault handling")
Signed-off-by: default avatarJanis Schoetterl-Glausch <scgl@linux.ibm.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarClaudio Imbrenda <imbrenda@linux.ibm.com>
Link: https://lore.kernel.org/r/20211022152648.26536-1-scgl@linux.ibm.com


Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 67cf68b6

arch/s390/kvm/priv.c

+2 −0
Original line number Diff line number Diff line
@@ -397,6 +397,8 @@ static int handle_sske(struct kvm_vcpu *vcpu) 
		mmap_read_unlock(current->mm);

		if (rc == -EFAULT)

			return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);

		if (rc == -EAGAIN)

			continue;

		if (rc < 0)

			return rc;

		start += PAGE_SIZE;