Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E28AFC433DF for ; Mon, 18 May 2020 08:51:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A0935206D4 for ; Mon, 18 May 2020 08:51:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A0935206D4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jabUd-0003fE-TU for qemu-devel@archiver.kernel.org; Mon, 18 May 2020 04:51:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jabTa-00033B-Nn; Mon, 18 May 2020 04:50:23 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:47676) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jabTZ-00020A-CZ; Mon, 18 May 2020 04:50:22 -0400 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 04I8WwSa083628; Mon, 18 May 2020 04:50:19 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 312cp7hdns-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 May 2020 04:50:19 -0400 Received: from m0098394.ppops.net (m0098394.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 04I8YVV4093330; Mon, 18 May 2020 04:50:18 -0400 Received: from ppma05fra.de.ibm.com (6c.4a.5195.ip4.static.sl-reverse.com [149.81.74.108]) by mx0a-001b2d01.pphosted.com with ESMTP id 312cp7hdmu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 May 2020 04:50:18 -0400 Received: from pps.filterd (ppma05fra.de.ibm.com [127.0.0.1]) by ppma05fra.de.ibm.com (8.16.0.27/8.16.0.27) with SMTP id 04I8en2E002520; Mon, 18 May 2020 08:50:16 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma05fra.de.ibm.com with ESMTP id 3127t5hgrk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 May 2020 08:50:15 +0000 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 04I8oDsw63701188 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 18 May 2020 08:50:13 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 19812A4065; Mon, 18 May 2020 08:50:13 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5DA87A405B; Mon, 18 May 2020 08:50:12 +0000 (GMT) Received: from localhost.localdomain (unknown [9.145.44.214]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 18 May 2020 08:50:12 +0000 (GMT) Subject: Re: [PATCH v2 3/8] s390/sclp: rework sclp boundary and length checks To: Collin Walling , qemu-devel@nongnu.org, qemu-s390x@nongnu.org References: <20200515222032.18838-1-walling@linux.ibm.com> <20200515222032.18838-4-walling@linux.ibm.com> From: Janosch Frank Autocrypt: addr=frankja@linux.ibm.com; prefer-encrypt=mutual; keydata= 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 Message-ID: <2fcd0d94-12c7-e3b8-d6a6-3c512ae25150@linux.ibm.com> Date: Mon, 18 May 2020 10:50:11 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20200515222032.18838-4-walling@linux.ibm.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="9fc1Pz5E1hdkNOz6N44GVwEPR27MLGtca" X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216, 18.0.676 definitions=2020-05-18_02:2020-05-15, 2020-05-18 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 suspectscore=0 adultscore=0 mlxlogscore=999 bulkscore=0 cotscore=-2147483648 priorityscore=1501 malwarescore=0 clxscore=1015 phishscore=0 impostorscore=0 lowpriorityscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2005180074 Received-SPF: pass client-ip=148.163.156.1; envelope-from=frankja@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/18 04:50:19 X-ACL-Warn: Detected OS = Linux 3.x [generic] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, KHOP_DYNAMIC=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, david@redhat.com, cohuck@redhat.com, pasic@linux.ibm.com, borntraeger@de.ibm.com, mst@redhat.com, svens@linux.ibm.com, pbonzini@redhat.com, mihajlov@linux.ibm.com, rth@twiddle.net Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --9fc1Pz5E1hdkNOz6N44GVwEPR27MLGtca Content-Type: multipart/mixed; boundary="6BHKm31KIiuR4G8N19tNfvCCwc25KaShK" --6BHKm31KIiuR4G8N19tNfvCCwc25KaShK Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 5/16/20 12:20 AM, Collin Walling wrote: > Rework the SCLP boundary check to account for different SCLP commands > (eventually) allowing different boundary sizes. >=20 > Move the length check code into a separate function, and introduce a > new function to determine the length of the read SCP data (i.e. the siz= e > from the start of the struct to where the CPU entries should begin). >=20 > Signed-off-by: Collin Walling > --- > hw/s390x/sclp.c | 57 ++++++++++++++++++++++++++++++++++++++++++-------= > 1 file changed, 49 insertions(+), 8 deletions(-) >=20 > diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c > index 2bd618515e..987699e3c4 100644 > --- a/hw/s390x/sclp.c > +++ b/hw/s390x/sclp.c > @@ -49,6 +49,34 @@ static inline bool sclp_command_code_valid(uint32_t = code) > return false; > } > =20 > +static bool sccb_has_valid_boundary(uint64_t sccb_addr, uint32_t code,= > + SCCBHeader *header) > +{ > + uint64_t current_len =3D sccb_addr + be16_to_cpu(header->length); > + uint64_t allowed_len =3D (sccb_addr & PAGE_MASK) + PAGE_SIZE; Those are addresses not length indications and the names should reflect that. Also don't we need to use PAGE_SIZE - 1? I'm still trying to wake up, so take this with a grain of salt. > + > + switch (code & SCLP_CMD_CODE_MASK) { > + default: > + if (current_len <=3D allowed_len) { > + return true; > + } > + } > + header->response_code =3D cpu_to_be16(SCLP_RC_SCCB_BOUNDARY_VIOLAT= ION); > + return false; > +} > + > +/* Calculates sufficient SCCB length to store a full Read SCP/CPU resp= onse */ > +static bool sccb_has_sufficient_len(SCCB *sccb, int num_cpus, int data= _len) > +{ > + int required_len =3D data_len + num_cpus * sizeof(CPUEntry); > + > + if (be16_to_cpu(sccb->h.length) < required_len) { > + sccb->h.response_code =3D cpu_to_be16(SCLP_RC_INSUFFICIENT_SCC= B_LENGTH); > + return false; > + } > + return true; > +} Hm, from the function name alone I'd not have expected it to also set the response code. > + > static void prepare_cpu_entries(MachineState *ms, CPUEntry *entry, int= *count) > { > uint8_t features[SCCB_CPU_FEATURE_LEN] =3D { 0 }; > @@ -66,6 +94,16 @@ static void prepare_cpu_entries(MachineState *ms, CP= UEntry *entry, int *count) > } > } > =20 > +/* > + * The data length denotes the start of the struct to where the first > + * CPU entry is to be allocated. This value also denotes the offset_cp= u > + * field. > + */ > +static int get_read_scp_info_data_len(void) > +{ > + return offsetof(ReadInfo, entries); > +} Not sure what the policy for this is, but maybe this can go into a header file? David and Conny will surely make that clear to me :) > + > /* Provide information about the configuration, CPUs and storage */ > static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb) > { > @@ -74,16 +112,16 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *= sccb) > int cpu_count; > int rnsize, rnmax; > IplParameterBlock *ipib =3D s390_ipl_get_iplb(); > + int data_len =3D get_read_scp_info_data_len(); > =20 > - if (be16_to_cpu(sccb->h.length) < (sizeof(ReadInfo) + cpu_count * = sizeof(CPUEntry))) { > - sccb->h.response_code =3D cpu_to_be16(SCLP_RC_INSUFFICIENT_SCC= B_LENGTH); > + if (!sccb_has_sufficient_len(sccb, machine->possible_cpus->len, da= ta_len)) { > return; > } > =20 > /* CPU information */ > prepare_cpu_entries(machine, read_info->entries, &cpu_count); > read_info->entries_cpu =3D cpu_to_be16(cpu_count); > - read_info->offset_cpu =3D cpu_to_be16(offsetof(ReadInfo, entries))= ; > + read_info->offset_cpu =3D cpu_to_be16(data_len); > read_info->highest_cpu =3D cpu_to_be16(machine->smp.max_cpus - 1);= > =20 > read_info->ibc_val =3D cpu_to_be32(s390_get_ibc_val()); > @@ -132,16 +170,16 @@ static void sclp_read_cpu_info(SCLPDevice *sclp, = SCCB *sccb) > { > MachineState *machine =3D MACHINE(qdev_get_machine()); > ReadCpuInfo *cpu_info =3D (ReadCpuInfo *) sccb; > + int data_len =3D offsetof(ReadCpuInfo, entries); > int cpu_count; > =20 > - if (be16_to_cpu(sccb->h.length) < (sizeof(ReadCpuInfo) + cpu_count= * sizeof(CPUEntry))) { > - sccb->h.response_code =3D cpu_to_be16(SCLP_RC_INSUFFICIENT_SCC= B_LENGTH); > + if (!sccb_has_sufficient_len(sccb, machine->possible_cpus->len, da= ta_len)) { > return; > } > =20 > prepare_cpu_entries(machine, cpu_info->entries, &cpu_count); > cpu_info->nr_configured =3D cpu_to_be16(cpu_count); > - cpu_info->offset_configured =3D cpu_to_be16(offsetof(ReadCpuInfo, = entries)); > + cpu_info->offset_configured =3D cpu_to_be16(data_len); > cpu_info->nr_standby =3D cpu_to_be16(0); > =20 > /* The standby offset is 16-byte for each CPU */ > @@ -227,6 +265,10 @@ int sclp_service_call_protected(CPUS390XState *env= , uint64_t sccb, > goto out_write; > } > =20 > + if (!sccb_has_valid_boundary(sccb, code, &work_sccb.h)) { > + goto out_write; > + } > + > sclp_c->execute(sclp, &work_sccb, code); > out_write: > s390_cpu_pv_mem_write(env_archcpu(env), 0, &work_sccb, > @@ -272,8 +314,7 @@ int sclp_service_call(CPUS390XState *env, uint64_t = sccb, uint32_t code) > goto out_write; > } > =20 > - if ((sccb + be16_to_cpu(work_sccb.h.length)) > ((sccb & PAGE_MASK)= + PAGE_SIZE)) { > - work_sccb.h.response_code =3D cpu_to_be16(SCLP_RC_SCCB_BOUNDAR= Y_VIOLATION); > + if (!sccb_has_valid_boundary(sccb, code, &work_sccb.h)) { > goto out_write; > } > =20 >=20 --6BHKm31KIiuR4G8N19tNfvCCwc25KaShK-- --9fc1Pz5E1hdkNOz6N44GVwEPR27MLGtca Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEwGNS88vfc9+v45Yq41TmuOI4ufgFAl7CTEMACgkQ41TmuOI4 ufhulg//fX25gNq1Dd9ovBlxEUAyu6hZ9W3Nxs2d51nakOoIQQZ0U9+fc+VM/g+k LhnRaoksqCfZcVKD/3hedK0Ste1x9oA7iWkox2a1y3mvuMwpcJTmLitTvoZC13bY I0Htjb1oqYEepnd/u3iN/tola+fo7UrQVR2S52V2RnIrJOcH4X+KmlUxFCwCc65X z1Ws1ZUOEU1A7Iu89ZTL2Lx29pdRxQWEFuVrsD9/8O+qQxeSiaIEW2qP9to4mTpI wh9aeMZT8dY97OKFMON804d0VwQD1HqrQnlVRoLCQsXF82I2L11znFfOzRH8uoFB 2Ach+ShC6b7Xj1z+C7pl3O0w0heCcL2N6UrI2opb+hU4goIdmMvnlBzlUoXYOR6e D22y7nPm4IYnLiBk2KuvtjHjTSQ7F5HwyckAy8d6yUb2P8UA4di//apY75q54l1l mZJtM3yIWYaoVVweX59Bb03Ks9a7yj8RmmZKNTs9byKe3Ksgku1ccvu+F7EtK7ve 1aot8XQPC5E6nJcaETCm6hIIXJ8UQexSykCkkn/46f4qGEtYglOdBTBWZjhUPfp2 QlFLn+fIAMG/t4jyoatJrw0m6rIOv39R2u4JpwGR7V9OCLS2LBW++ijJCKDQAueR yT/1I+5cEIhjQAP3G/Knbni6TDmOrUvZylIkVwN2u2GXVcEELe8= =NPX8 -----END PGP SIGNATURE----- --9fc1Pz5E1hdkNOz6N44GVwEPR27MLGtca--