Received: by 2002:a05:7412:8598:b0:f9:33c2:5753 with SMTP id n24csp522637rdh; Tue, 19 Dec 2023 06:10:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IHu7oWL+h7tZj3uy2YUO4xhP6v1UpTjb/RvUWnXpb6NLzxyXOB+vx+McnwjC+AjayHAPrn/ X-Received: by 2002:a05:6a20:9385:b0:190:9d87:f9e4 with SMTP id x5-20020a056a20938500b001909d87f9e4mr9659069pzh.72.1702995047652; Tue, 19 Dec 2023 06:10:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702995047; cv=none; d=google.com; s=arc-20160816; b=tdac82gkfWUlPrfOpSyn6aCWjF7SSicIJnQlkWo3PR+7eotfkt+rkJiBwjqM/jlcMV /ZR+0/mUhj7bumMM9CJuswCiUohRK2ZBczD9QOLEu8Y2TH5rP9UEmEfWJTfzQnxWQYIQ I7aJL/b8HU5IkhmIf8kWLR7zCtIXCMoH+LKnPfedMRlaLQgOQSWCHY4ITjPfIH+EYiEn cz2IOJycL/4cQE1HHZ+6fQj9vKj4fyw+0zebjklMVfgeoQsxdPM4W5upY5lQ8BOakXdD GQGzsqUgrsFoGN5/ijVswHMP1dgNN8LbRbnh9UbGvtT7UlDGWlJ3/XpJgMsb4Ufdf+5g 99rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=fWRxkzAhDZK1FfphcFsaugmqqVEHOAT+LkEdNqpzOko=; fh=e6Mivu/OBjVYtBlHul24QE2UuWJP074baZJHUhxiuTY=; b=J4sXPZQs/bo8Vd7mPyB3a3eVhSp7yfnwTV98yJbJp4Qa8HLgSdy3cP6DFqbDms/fz3 AtcpJGT4tTCecn4QSBXs8OjN3e1Lvhde4gwzS955G23dWAjl4UwF7gAxQrr867+pVeIn qBNn8K3hIqM1330JQbg3h8bU68AkTlAHn9LrxIlUtfVsMCw7Xr5gphERf2qNYtOvfT1b iqRc8fyFa3JDeSCLU5zvSBgxk9PV4G431EX+0uQuLVF4K1th65OsQ7y6gRrGICwsZRZk PYnZ78bchtwUYvMAWh2CNAHZU7ElaU/nwPfezSHlCSl/orPIpWdYeAytYgLnKQUpHV4A wvbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=IXt+m8zp; spf=pass (google.com: domain of linux-kernel+bounces-5324-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-5324-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id b13-20020a630c0d000000b005bda77217eesi19745229pgl.209.2023.12.19.06.10.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 06:10:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-5324-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=IXt+m8zp; spf=pass (google.com: domain of linux-kernel+bounces-5324-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-5324-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 702DAB23636 for ; Tue, 19 Dec 2023 14:10:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CE05F1C6A4; Tue, 19 Dec 2023 14:09:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="IXt+m8zp" X-Original-To: linux-kernel@vger.kernel.org Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C6A11CA92; Tue, 19 Dec 2023 14:09:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3BJDmSNH006793; Tue, 19 Dec 2023 14:09:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=fWRxkzAhDZK1FfphcFsaugmqqVEHOAT+LkEdNqpzOko=; b=IXt+m8zpsaz8jggFULxQpNVlzzuLKApFBA9L+xN1N+s3wJRc0y2h8dJX3JdPiaUcull6 22T8EScsIf3RBKRnabu1MgLR8LUOKmioLF3zr4v6YTqIP+5UiSTyOtfT3T8x0ilEL9od 3Hxkm8Bu5vk+IdoB3IZhTnEefIFTsWlDHlZmfoGB+nMAZFj/v0mymL21zccQJWVlal+1 V0xQdSYjo2DtCYEmQ6GSkZu5SRgK9bD1yAUKc+LBNSwg3Vg3UXpWbu3sB/EYcicazzjV ByJFoGd9OKCq+B+MqPUo3KtAz7YkUNyyXPTIuXxthrzxLQvGCXFaRzfWwnTrhn8+fbjx bw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3v3ccj8f1c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 19 Dec 2023 14:09:00 +0000 Received: from m0356516.ppops.net (m0356516.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3BJE0bou005623; Tue, 19 Dec 2023 14:08:59 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3v3ccj8f14-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 19 Dec 2023 14:08:59 +0000 Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3BJDhCV0013890; Tue, 19 Dec 2023 14:08:59 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3v1qqk8042-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 19 Dec 2023 14:08:58 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3BJE8tsW43713230 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Dec 2023 14:08:55 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BEB572004D; Tue, 19 Dec 2023 14:08:55 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 83D6520040; Tue, 19 Dec 2023 14:08:55 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 19 Dec 2023 14:08:55 +0000 (GMT) From: Nina Schoetterl-Glausch To: Christian Borntraeger , Alexander Gordeev , Janosch Frank , Claudio Imbrenda , Heiko Carstens , Vasily Gorbik Cc: Nina Schoetterl-Glausch , David Hildenbrand , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Sven Schnelle , linux-s390@vger.kernel.org Subject: [PATCH v4 1/4] KVM: s390: vsie: Fix STFLE interpretive execution identification Date: Tue, 19 Dec 2023 15:08:50 +0100 Message-Id: <20231219140854.1042599-2-nsg@linux.ibm.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231219140854.1042599-1-nsg@linux.ibm.com> References: <20231219140854.1042599-1-nsg@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: vjKaHMiOhDOs5wsxgQEwp-ApItr21bt5 X-Proofpoint-GUID: 8F4Gg2hasNq1wIvUivJk1GA7iYhY5vyH X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-19_08,2023-12-14_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 clxscore=1015 malwarescore=0 impostorscore=0 suspectscore=0 spamscore=0 lowpriorityscore=0 bulkscore=0 priorityscore=1501 mlxscore=0 adultscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312190105 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: 66b630d5b7f2 ("KVM: s390: vsie: support STFLE interpretation") Reviewed-by: Claudio Imbrenda Acked-by: David Hildenbrand Signed-off-by: Nina Schoetterl-Glausch --- arch/s390/kvm/vsie.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index 8207a892bbe2..35937911724e 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -984,10 +984,15 @@ static void retry_vsie_icpt(struct vsie_page *vsie_page) static int handle_stfle(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) { struct kvm_s390_sie_block *scb_s = &vsie_page->scb_s; - __u32 fac = READ_ONCE(vsie_page->scb_o->fac) & 0x7ffffff8U; + __u32 fac = READ_ONCE(vsie_page->scb_o->fac); if (fac && test_kvm_facility(vcpu->kvm, 7)) { retry_vsie_icpt(vsie_page); + /* + * The facility list origin (FLO) is in bits 1 - 28 of the FLD + * so we need to mask here before reading. + */ + fac = fac & 0x7ffffff8U; if (read_guest_real(vcpu, fac, &vsie_page->fac, sizeof(vsie_page->fac))) return set_validity_icpt(scb_s, 0x1090U); -- 2.40.1