From nobody Sat May 4 07:01:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1617900052; cv=none; d=zohomail.com; s=zohoarc; b=BzD9neZEhQ5WU3prDqx7scMeXfGEZO/+FY+prYeX2e45ixyZ7KW9a5AdIE9zFkcoCrqJJnd2rKHlUyMh288LLJ/Z+JH+wOZR0/l47H4SkEsqbp/Z9naF+lnjfm+VCGS8uT7tdqUvSTYedIFQNtdS4HW9a7Ji/33osMo2E2Lw2jQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617900052; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=QHf7OpFTCv7ItIckEW5m1EEXXTMSJxhx1ytZ0sPUmB8=; b=aJiuRxlLuUpi+K0hz9xJs5X3c+/0YKvnr+14FQMnt9NJi5/MFIjTbbyuD3+j1V3B7WbgexRYg788tA21/QHmt5QMM4bDSmIe9obGGgU0iahuKFFpFGjvejmCsCCd3q+XUtohehcEq/1iVURxTMF7Eec1NFocDvPW9MX9M9cIOjQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617900052142809.471250607846; Thu, 8 Apr 2021 09:40:52 -0700 (PDT) Received: from localhost ([::1]:46266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUXi7-0000X3-5V for importer@patchew.org; Thu, 08 Apr 2021 12:40:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUXZy-0000xu-1h; Thu, 08 Apr 2021 12:32:27 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:23306 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUXZt-0001ZA-Cj; Thu, 08 Apr 2021 12:32:25 -0400 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 138G7OSl183992; Thu, 8 Apr 2021 12:32:19 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 37rvy8cp40-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 08 Apr 2021 12:32:18 -0400 Received: from m0098414.ppops.net (m0098414.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 138G8KvV190681; Thu, 8 Apr 2021 12:32:18 -0400 Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0b-001b2d01.pphosted.com with ESMTP id 37rvy8cp36-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 08 Apr 2021 12:32:18 -0400 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.0.43/8.16.0.43) with SMTP id 138GRSer026845; Thu, 8 Apr 2021 16:32:16 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma03ams.nl.ibm.com with ESMTP id 37t3h8g2td-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 08 Apr 2021 16:32:16 +0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 138GWDJw51577164 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 8 Apr 2021 16:32:13 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4176B4C04E; Thu, 8 Apr 2021 16:32:13 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B1B884C073; Thu, 8 Apr 2021 16:32:12 +0000 (GMT) Received: from oc3016276355.ibm.com (unknown [9.145.156.198]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 8 Apr 2021 16:32:12 +0000 (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; s=pp1; bh=QHf7OpFTCv7ItIckEW5m1EEXXTMSJxhx1ytZ0sPUmB8=; b=f62afModWwDNjzGRQkM1ZFzO6ymht3rjoBewiffZqQNXNAE14J/9GqO0CqdEkjF2LLrK IeRNb4NJDsc9pVQcLl1dt/6jEJmZr+VLvUlhusPlbQsXwwHLYdaKsjANjtuWavcBwwjr ILpHMJXVTOuGFZtFeB9p0lEFqPE7Uu9MAG4XmfYhigi5FT9phsOg09bvQ1o8b5qMKvCB qB1XhN7f2tNmzmU1L0LHU16xD5VuH6XzNGd1jX0iqrwMwXrmpkcE0xY01WvtJEMjEnDv eUNuJqPw+vCRKzojRrBHrr4YxC/vHNybWiMq+8633Whndk7S8WFOzw0bAFPd/1tinZcE gw== From: Pierre Morel To: qemu-devel@nongnu.org Subject: [PATCH v2 1/1] s390x: css: report errors from ccw_dstream_read/write Date: Thu, 8 Apr 2021 18:32:09 +0200 Message-Id: <1617899529-9329-2-git-send-email-pmorel@linux.ibm.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1617899529-9329-1-git-send-email-pmorel@linux.ibm.com> References: <1617899529-9329-1-git-send-email-pmorel@linux.ibm.com> X-TM-AS-GCONF: 00 X-Proofpoint-GUID: XWQoGf2U4R10e2QwzkgZ_r6x1fuH_sYE X-Proofpoint-ORIG-GUID: q07tgC6L9sMPrkAXxkVysTWeEUH8OkEb X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.761 definitions=2021-04-08_03:2021-04-08, 2021-04-08 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 suspectscore=0 lowpriorityscore=0 clxscore=1015 adultscore=0 phishscore=0 spamscore=0 priorityscore=1501 mlxscore=0 impostorscore=0 mlxlogscore=999 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104060000 definitions=main-2104080107 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.158.5; envelope-from=pmorel@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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, frankja@linux.ibm.com, david@redhat.com, cohuck@redhat.com, richard.henderson@linaro.org, pasic@linux.ibm.com, borntraeger@de.ibm.com, qemu-s390x@nongnu.org, mst@redhat.com, pbonzini@redhat.com, marcandre.lureau@redhat.com, imbrenda@linux.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" ccw_dstream_read/write functions returned values are sometime not taking into account and reported back to the upper level of interpretation of CCW instructions. It follows that accessing an invalid address does not trigger a subchannel status program check to the guest as it should. Let's test the return values of ccw_dstream_write[_buf] and ccw_dstream_read[_buf] and report it to the caller. Signed-off-by: Pierre Morel Acked-by: Halil Pasic --- hw/char/terminal3270.c | 11 +++++-- hw/s390x/3270-ccw.c | 5 +++- hw/s390x/css.c | 14 +++++---- hw/s390x/virtio-ccw.c | 66 ++++++++++++++++++++++++++++++------------ 4 files changed, 69 insertions(+), 27 deletions(-) diff --git a/hw/char/terminal3270.c b/hw/char/terminal3270.c index a9a46c8ed3..82e85fac2e 100644 --- a/hw/char/terminal3270.c +++ b/hw/char/terminal3270.c @@ -200,9 +200,13 @@ static int read_payload_3270(EmulatedCcw3270Device *de= v) { Terminal3270 *t =3D TERMINAL_3270(dev); int len; + int ret; =20 len =3D MIN(ccw_dstream_avail(get_cds(t)), t->in_len); - ccw_dstream_write_buf(get_cds(t), t->inv, len); + ret =3D ccw_dstream_write_buf(get_cds(t), t->inv, len); + if (ret < 0) { + return ret; + } t->in_len -=3D len; =20 return len; @@ -260,7 +264,10 @@ static int write_payload_3270(EmulatedCcw3270Device *d= ev, uint8_t cmd) =20 t->outv[out_len++] =3D cmd; do { - ccw_dstream_read_buf(get_cds(t), &t->outv[out_len], len); + retval =3D ccw_dstream_read_buf(get_cds(t), &t->outv[out_len], len= ); + if (retval < 0) { + return retval; + } count =3D ccw_dstream_avail(get_cds(t)); out_len +=3D len; =20 diff --git a/hw/s390x/3270-ccw.c b/hw/s390x/3270-ccw.c index 821319eee6..f3e7342b1e 100644 --- a/hw/s390x/3270-ccw.c +++ b/hw/s390x/3270-ccw.c @@ -31,6 +31,9 @@ static int handle_payload_3270_read(EmulatedCcw3270Device= *dev, CCW1 *ccw) } =20 len =3D ck->read_payload_3270(dev); + if (len < 0) { + return len; + } ccw_dev->sch->curr_status.scsw.count =3D ccw->count - len; =20 return 0; @@ -50,7 +53,7 @@ static int handle_payload_3270_write(EmulatedCcw3270Devic= e *dev, CCW1 *ccw) len =3D ck->write_payload_3270(dev, ccw->cmd_code); =20 if (len <=3D 0) { - return -EIO; + return len ? len : -EIO; } =20 ccw_dev->sch->curr_status.scsw.count =3D ccw->count - len; diff --git a/hw/s390x/css.c b/hw/s390x/css.c index fe47751df4..4149b8e5a7 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -1055,10 +1055,11 @@ static int css_interpret_ccw(SubchDev *sch, hwaddr = ccw_addr, } } len =3D MIN(ccw.count, sizeof(sch->sense_data)); - ccw_dstream_write_buf(&sch->cds, sch->sense_data, len); + ret =3D ccw_dstream_write_buf(&sch->cds, sch->sense_data, len); sch->curr_status.scsw.count =3D ccw_dstream_residual_count(&sch->c= ds); - memset(sch->sense_data, 0, sizeof(sch->sense_data)); - ret =3D 0; + if (!ret) { + memset(sch->sense_data, 0, sizeof(sch->sense_data)); + } break; case CCW_CMD_SENSE_ID: { @@ -1083,9 +1084,10 @@ static int css_interpret_ccw(SubchDev *sch, hwaddr c= cw_addr, } else { sense_id[0] =3D 0; } - ccw_dstream_write_buf(&sch->cds, sense_id, len); - sch->curr_status.scsw.count =3D ccw_dstream_residual_count(&sch->c= ds); - ret =3D 0; + ret =3D ccw_dstream_write_buf(&sch->cds, sense_id, len); + if (!ret) { + sch->curr_status.scsw.count =3D ccw_dstream_residual_count(&sc= h->cds); + } break; } case CCW_CMD_TIC: diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 314ed7b245..8195f3546e 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -288,14 +288,20 @@ static int virtio_ccw_handle_set_vq(SubchDev *sch, CC= W1 ccw, bool check_len, return -EFAULT; } if (is_legacy) { - ccw_dstream_read(&sch->cds, linfo); + ret =3D ccw_dstream_read(&sch->cds, linfo); + if (ret) { + return ret; + } linfo.queue =3D be64_to_cpu(linfo.queue); linfo.align =3D be32_to_cpu(linfo.align); linfo.index =3D be16_to_cpu(linfo.index); linfo.num =3D be16_to_cpu(linfo.num); ret =3D virtio_ccw_set_vqs(sch, NULL, &linfo); } else { - ccw_dstream_read(&sch->cds, info); + ret =3D ccw_dstream_read(&sch->cds, info); + if (ret) { + return ret; + } info.desc =3D be64_to_cpu(info.desc); info.index =3D be16_to_cpu(info.index); info.num =3D be16_to_cpu(info.num); @@ -371,7 +377,10 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) VirtioDeviceClass *vdc =3D VIRTIO_DEVICE_GET_CLASS(vdev); =20 ccw_dstream_advance(&sch->cds, sizeof(features.features)); - ccw_dstream_read(&sch->cds, features.index); + ret =3D ccw_dstream_read(&sch->cds, features.index); + if (ret) { + break; + } if (features.index =3D=3D 0) { if (dev->revision >=3D 1) { /* Don't offer legacy features for modern devices. */ @@ -392,9 +401,10 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) } ccw_dstream_rewind(&sch->cds); features.features =3D cpu_to_le32(features.features); - ccw_dstream_write(&sch->cds, features.features); - sch->curr_status.scsw.count =3D ccw.count - sizeof(features); - ret =3D 0; + ret =3D ccw_dstream_write(&sch->cds, features.features); + if (!ret) { + sch->curr_status.scsw.count =3D ccw.count - sizeof(feature= s); + } } break; case CCW_CMD_WRITE_FEAT: @@ -411,7 +421,10 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) if (!ccw.cda) { ret =3D -EFAULT; } else { - ccw_dstream_read(&sch->cds, features); + ret =3D ccw_dstream_read(&sch->cds, features); + if (ret) { + break; + } features.features =3D le32_to_cpu(features.features); if (features.index =3D=3D 0) { virtio_set_features(vdev, @@ -454,9 +467,10 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) ret =3D -EFAULT; } else { virtio_bus_get_vdev_config(&dev->bus, vdev->config); - ccw_dstream_write_buf(&sch->cds, vdev->config, len); - sch->curr_status.scsw.count =3D ccw.count - len; - ret =3D 0; + ret =3D ccw_dstream_write_buf(&sch->cds, vdev->config, len); + if (ret) { + sch->curr_status.scsw.count =3D ccw.count - len; + } } break; case CCW_CMD_WRITE_CONF: @@ -511,7 +525,10 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) if (!ccw.cda) { ret =3D -EFAULT; } else { - ccw_dstream_read(&sch->cds, status); + ret =3D ccw_dstream_read(&sch->cds, status); + if (ret) { + break; + } if (!(status & VIRTIO_CONFIG_S_DRIVER_OK)) { virtio_ccw_stop_ioeventfd(dev); } @@ -554,7 +571,10 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) if (!ccw.cda) { ret =3D -EFAULT; } else { - ccw_dstream_read(&sch->cds, indicators); + ret =3D ccw_dstream_read(&sch->cds, indicators); + if (ret) { + break; + } indicators =3D be64_to_cpu(indicators); dev->indicators =3D get_indicator(indicators, sizeof(uint64_t)= ); sch->curr_status.scsw.count =3D ccw.count - sizeof(indicators); @@ -575,7 +595,10 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) if (!ccw.cda) { ret =3D -EFAULT; } else { - ccw_dstream_read(&sch->cds, indicators); + ret =3D ccw_dstream_read(&sch->cds, indicators); + if (ret) { + break; + } indicators =3D be64_to_cpu(indicators); dev->indicators2 =3D get_indicator(indicators, sizeof(uint64_t= )); sch->curr_status.scsw.count =3D ccw.count - sizeof(indicators); @@ -596,7 +619,10 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) if (!ccw.cda) { ret =3D -EFAULT; } else { - ccw_dstream_read(&sch->cds, vq_config.index); + ret =3D ccw_dstream_read(&sch->cds, vq_config.index); + if (ret) { + break; + } vq_config.index =3D be16_to_cpu(vq_config.index); if (vq_config.index >=3D VIRTIO_QUEUE_MAX) { ret =3D -EINVAL; @@ -605,9 +631,10 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) vq_config.num_max =3D virtio_queue_get_num(vdev, vq_config.index); vq_config.num_max =3D cpu_to_be16(vq_config.num_max); - ccw_dstream_write(&sch->cds, vq_config.num_max); - sch->curr_status.scsw.count =3D ccw.count - sizeof(vq_config); - ret =3D 0; + ret =3D ccw_dstream_write(&sch->cds, vq_config.num_max); + if (!ret) { + sch->curr_status.scsw.count =3D ccw.count - sizeof(vq_conf= ig); + } } break; case CCW_CMD_SET_IND_ADAPTER: @@ -664,7 +691,10 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) ret =3D -EFAULT; break; } - ccw_dstream_read_buf(&sch->cds, &revinfo, 4); + ret =3D ccw_dstream_read_buf(&sch->cds, &revinfo, 4); + if (ret < 0) { + break; + } revinfo.revision =3D be16_to_cpu(revinfo.revision); revinfo.length =3D be16_to_cpu(revinfo.length); if (ccw.count < len + revinfo.length || --=20 2.17.1