Skip to content

Commit 2731d60

Browse files
Nina Schoetterl-Glauschfrankjaa
authored andcommitted
KVM: s390: vsie: Fix STFLE interpretive execution identification
STFLE can be interpretively executed. This occurs when the facility list designation is unequal to zero. Perform the check before applying the address mask instead of after. Fixes: 66b630d ("KVM: s390: vsie: support STFLE interpretation") Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com> Acked-by: David Hildenbrand <david@redhat.com> Signed-off-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com> Reviewed-by: Christian Borntraeger <borntraeger@linux.ibm.com> Reviewed-by: Janosch Frank <frankja@linux.ibm.com> Link: https://lore.kernel.org/r/20231219140854.1042599-2-nsg@linux.ibm.com Signed-off-by: Janosch Frank <frankja@linux.ibm.com> Message-ID: <20231219140854.1042599-2-nsg@linux.ibm.com>
1 parent 26fb87f commit 2731d60

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

arch/s390/kvm/vsie.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,10 +988,15 @@ static void retry_vsie_icpt(struct vsie_page *vsie_page)
988988
static int handle_stfle(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
989989
{
990990
struct kvm_s390_sie_block *scb_s = &vsie_page->scb_s;
991-
__u32 fac = READ_ONCE(vsie_page->scb_o->fac) & 0x7ffffff8U;
991+
__u32 fac = READ_ONCE(vsie_page->scb_o->fac);
992992

993993
if (fac && test_kvm_facility(vcpu->kvm, 7)) {
994994
retry_vsie_icpt(vsie_page);
995+
/*
996+
* The facility list origin (FLO) is in bits 1 - 28 of the FLD
997+
* so we need to mask here before reading.
998+
*/
999+
fac = fac & 0x7ffffff8U;
9951000
if (read_guest_real(vcpu, fac, &vsie_page->fac,
9961001
sizeof(vsie_page->fac)))
9971002
return set_validity_icpt(scb_s, 0x1090U);

0 commit comments

Comments
 (0)