From nobody Sat Sep 26 19:59:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1790108343; cv=none; d=zohomail.com; s=zohoarc; b=BePOoQxShc/4FEAp0pewR9Pti7egQvccQXsOvhyv9cHorP/tBC4s0CV1SipOdnP1COUwX2b+iu4Oo0QRsqPJrS/Y+VtF8su/tTRrvkeZFV2O+2LYEnOXSyWQ6mpOSC5BH2/gMGi1b8+oIN0MoTlRogWQv37f+9R4Qvkq6aPJVVA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108343; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=aJBAKsAe03AT8vnFUrBRwGAoE1EpNeTqykTgXnfAVKk=; b=PWhTEGQJ2+/Zy8L9eXwDUSB0u8v8O7Jfa9mAgfqI96HbHUr+2qV2uFB767A7e5/Nh2ohSaBOAyRRzKUhYq2BLu3Wibhl8sxAyddIxYQczHPc+2tMo/bckHp739fd+uRvnD/nzr24/7JVN+g/AIUS+5l8KQ4GQeofMe3ah/Cdrdo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790108343799702.4057623777207; Tue, 22 Sep 2026 13:19:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96vN-0000Ce-3H; Tue, 22 Sep 2026 16:17:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96tu-00081u-3p; Tue, 22 Sep 2026 16:15:38 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96tr-0007fi-76; Tue, 22 Sep 2026 16:15:37 -0400 Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68MI75pd1129420; Tue, 22 Sep 2026 20:15:32 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4gskg2ftqw-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 20:15:32 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.11/8.18.1.11) with ESMTP id 68MIHbEN3220323; Tue, 22 Sep 2026 20:15:31 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4gt53vkdxc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 20:15:31 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68MKFRx252166936 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 22 Sep 2026 20:15:27 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9A4692004F; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 78BD12004B; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav02.fra02v.mail.ibm.com (Postfix) with SMTP; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4958) id 5E8F816142E; Tue, 22 Sep 2026 22:15:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=aJBAKsAe03AT8vnFU rBRwGAoE1EpNeTqykTgXnfAVKk=; b=dNaV3zQBDVdqhYT/Nhf/OWIeSBFbzS6ZU QUdSvkRWNNbwjuHPQVCwsrNto3pfmbObzFgrBcoyQyOM97p+o6eD9/iHn9MZ6Bhq hOcuuwAbY2s7+CvwiXvFSCgzfR6H/cFLghjtErnzcZHSZ/XA5/R1jkjm/BnBuYoK C6qQPE8te2oj4be8K4mE8MESEAvoBqlTTA4oP1zqcjXFtWF3/F48PjdapUx39jvK GEPQzzdImAley5Q9rlRD/GL1nkMACW9xBxTwNn4RWjvn2Ehr+Gh8l8/WYJHODmHX zlyaMPXBdAL0EE67fRFgQU2ep3lNW+He4V+BSXEh8Bsvm/f/Nr75w== From: Eric Farman To: Christian Borntraeger , Matthew Rosato Cc: Cornelia Huck , qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Eric Farman , qemu-stable@nongnu.org Subject: [PATCH v3 1/9] virtio-ccw: Limit ISC to MAX_ISC Date: Tue, 22 Sep 2026 22:15:17 +0200 Message-ID: <20260922201526.2383047-2-farman@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260922201526.2383047-1-farman@linux.ibm.com> References: <20260922201526.2383047-1-farman@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: m-biI9B_e6ZKapVdyB7NTuikANb767hi X-Authority-Analysis: v=2.4 cv=I43w19gg c=1 sm=1 tr=0 ts=6ab2e1e4 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=69wJf7TsAAAA:8 a=VnNF1IyMAAAA:8 a=o2FE-jkhVZ_mc2e-VYYA:9 a=Fg1AiH1G6rFz08G2ETeA:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDI5MyBTYWx0ZWRfX4bH9Q/N9tuQQ aug2CQS493PLzuGOgK4xR12ua/QORGYTzD/wj2vEzDJt3X18PoHjLIPbxVTP6Ee9WdG/wRGwW34 wfrX4ThYSU16riGbXOOXf+mfUrjdBnhGU/NkTnvZgWOtJi32X8iYNw3UeLFncOhW74c79cSH1E6 2gWd6+Fip5tDzBFmo8n6bS2yTDhAdQlIZDzi/Yyfos16CKfnliy5fVWVYBO0LRqD7R3Ru+vT2ql 8/aBITwTcFSXYufZTrg8Js03FG0Lnp3EJtu9q5ecxmunGG6TK2GzoqMou8WOu0l0nUB4OTIGeA/ mAIXC2wlaGsHhAKrYCrJxJe0dvqGrjZWH72QkyWJTQK1Nkna7rEO8f/Gb8RoP2F8TFQDv1TEfJw zC+p2kWIs2DD0ZHxuxTgvn1/ARTdJNMHTV0tl8BVGqj1VrpBRT0T7FxIryREc37kvYItk053sFR lc4K1t9+FlmIbTzJVvA== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDI5MyBTYWx0ZWRfX+QmTzGzxPFxw 4IwQkNJydASoc0I9SKIXcVjETj/Ie4DLNCdgbsdAM9HOzhWa/SgW/yHZhI7egV6MlUckcm9+mIP E9PL1p6GG49C9rNe9Dsb160nJ8UByD4= X-Proofpoint-GUID: m-biI9B_e6ZKapVdyB7NTuikANb767hi X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-22_03,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 clxscore=1015 adultscore=0 suspectscore=0 impostorscore=0 lowpriorityscore=0 bulkscore=0 phishscore=0 priorityscore=1501 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220293 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=lists1p.gnu.org; Received-SPF: pass client-ip=148.163.156.1; envelope-from=farman@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_H4=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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1790108345167158500 Content-Type: text/plain; charset="utf-8" The interrupt subclass is often defined as a uint8, though in practice it will be within the range of just 0-7. Ensure that a guest-supplied subclass does not extend beyond its expected range, especially when used as an array index. Cc: qemu-stable@nongnu.org Fixes: 25a08b8ded ("s390x/css: update css_adapter_interrupt") Reviewed-by: Matthew Rosato Signed-off-by: Eric Farman --- hw/s390x/css.c | 7 ++++++- hw/s390x/virtio-ccw.c | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/hw/s390x/css.c b/hw/s390x/css.c index 76dbca3bb9..9da9128d88 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -654,8 +654,13 @@ void css_adapter_interrupt(CssIoAdapterType type, uint= 8_t isc) S390FLICState *fs =3D s390_get_flic(); S390FLICStateClass *fsc =3D s390_get_flic_class(fs); uint32_t io_int_word =3D (isc << 27) | IO_INT_WORD_AI; - IoAdapter *adapter =3D channel_subsys.io_adapters[type][isc]; + IoAdapter *adapter; + + if (type >=3D CSS_IO_ADAPTER_TYPE_NUMS || isc > MAX_ISC) { + return; + } =20 + adapter =3D channel_subsys.io_adapters[type][isc]; if (!adapter) { return; } diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 30fb2c0681..eb6378ea4c 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -46,6 +46,10 @@ static int virtio_ccw_dev_post_load(void *opaque, int ve= rsion_id) CcwDevice *ccw_dev =3D CCW_DEVICE(dev); CCWDeviceClass *ck =3D CCW_DEVICE_GET_CLASS(ccw_dev); =20 + if (dev->thinint_isc > MAX_ISC) { + return -EINVAL; + } + ccw_dev->sch->driver_data =3D dev; if (ccw_dev->sch->thinint_active) { dev->routes.adapter.adapter_id =3D css_get_adapter_id( @@ -659,6 +663,8 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) } else { if (ccw_dstream_read(&sch->cds, thinint)) { ret =3D -EFAULT; + } else if (thinint.isc > MAX_ISC) { + ret =3D -ENOSYS; } else { thinint.ind_bit =3D be64_to_cpu(thinint.ind_bit); thinint.summary_indicator =3D --=20 2.53.0 From nobody Sat Sep 26 19:59:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1790108300; cv=none; d=zohomail.com; s=zohoarc; b=RAGy7VO4KazWVT4r5KQkUsGyoy2MIJ6CMrUNoPZkxiBOnOVjuh01uFugDudX7OCEnJ/INzd6K+5ZINcLJkf6gLSwM2jEt0xeAwhoJY+cWrvkh5NYDIb7YjH5rf1SrcmCwIm0ErBNca81W3i+Tpn3EOdBFXqmAE82GKJW8tsnQEo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108300; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=OJpxIhHsMztPzQL0eEp1scuj7rvJmb5nCDOVz/uqYzs=; b=fuAL0fD9GhnVEMi9meYVFcuOgxRnqKEZ4JBOR7UOD4EG3paEVvkKocj4Z+oUTaYaZOXQ5/iUaCq1PDUSnFN3fQ6PeSGZbSqoKNAdLQQqLrwilvv6dyJrQvNJG+1uS99jRzALJc7YN9wNR5j/52zBjiIJQnayArwZTNWHvVSrJKw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790108300261946.2654243030539; Tue, 22 Sep 2026 13:18:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96w2-0000jT-US; Tue, 22 Sep 2026 16:17:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96tv-000827-Cs; Tue, 22 Sep 2026 16:15:43 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96tr-0007fn-AL; Tue, 22 Sep 2026 16:15:39 -0400 Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68MI78RI1128992; Tue, 22 Sep 2026 20:15:32 GMT Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4gskgs7sf0-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 20:15:32 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.11/8.18.1.11) with ESMTP id 68MIHWFw3198560; Tue, 22 Sep 2026 20:15:31 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4gt5qjuba0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 20:15:31 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68MKFRGh53477766 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 22 Sep 2026 20:15:27 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 953842004B; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 77BA020043; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav03.fra02v.mail.ibm.com (Postfix) with SMTP; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4958) id 60B2A1614F9; Tue, 22 Sep 2026 22:15:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=OJpxIhHsMztPzQL0e Ep1scuj7rvJmb5nCDOVz/uqYzs=; b=q5la7R+dWWQ/stGGDf7u+ptD2JtNrIFIL izd0CQsE/MnO6AsHsqxI910SkmD3FY9Xxch4sX2vV/yhJkw5qZoOP8sCBPWWa99H M2AXv1RxN5pCXi/0Us1UoU0F0TyUqzFf+CjVX+gGkrGBYRGAjjYzdRVHGi5qprDZ bOUJK9gT23LW8ATfbOBlBxq2DCnouR8zZVbBGjQzMsTcJQHMBTg0Vnhehe7s6uXg YkADKAE3OpBeGnS2kSk+oBiwIvyJCKAoSHc43gDS5p83lHk/8Xyu8ifSFC8GhQxh ybA5O1UeTyZzaJvmM333NBtXX9j3EBm3FqZRbnRhNDhUhvcC8R+gA== From: Eric Farman To: Christian Borntraeger , Matthew Rosato Cc: Cornelia Huck , qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Eric Farman , qemu-stable@nongnu.org Subject: [PATCH v3 2/9] virtio-ccw: Do not overwrite existing indicators Date: Tue, 22 Sep 2026 22:15:18 +0200 Message-ID: <20260922201526.2383047-3-farman@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260922201526.2383047-1-farman@linux.ibm.com> References: <20260922201526.2383047-1-farman@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=V/XoQuni c=1 sm=1 tr=0 ts=6ab2e1e4 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=69wJf7TsAAAA:8 a=VnNF1IyMAAAA:8 a=smRGcg3zAD8wOz9YheIA:9 a=Fg1AiH1G6rFz08G2ETeA:22 X-Proofpoint-ORIG-GUID: r59wVxL6v1uan8OLa4CD0ZFDA9MU0uRA X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDI5MyBTYWx0ZWRfX35IO7cD4t38Z cE292Z86X5nnQV4UPgKbCdblaSi4eoIqOPaDgtpxTglsKPJijaoGcVyBs1D1g/Vc7stAWhsGWYA BkGkmxcFda598gVcO+O3dLXgdiLXMIoMMbKGdo6MM+RR65E9QArWPowWSa+gfa5YeVtggRwmiyZ 2i1ggt/L/Sh/C//SnNES049OYIqZl9sq+hDVeFxSAGhEER5ycayMhgW112QUc+ta0w05JzaEvra JRliWkdPE8L9v+A9sMNu2jzR+nTMxnunjD/wYVBOGGhvf1fQtnC3c2VQhSxWxVLxmy96uRvUH7q jvFRIdzUiI4xFPdtzGIGHEs7Go9h+YJHeRQpnCB0p5ddKhBTkgz2X0vF10CS2CNuZCHgWFPZS6x 5OaoXIAE0+s7v9nmHrYKokahFNsmQE6f6ZTv5fehw5JVqDRBPLFWGZwEoqnOiPK+vCI5u5ijNUQ A9JZPvxRiMMj6Poye0g== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDI5MyBTYWx0ZWRfX6TGLOlKlUxN1 khWI5gE2RpfVWUY81TIlK5YRaDHX6TnT+CEEqZP7mvmx2gPeAO2P/NnyRg/eFFt2LP3++PdIhTW o75uFxxYEpkIjCM0r2s+5KVSIQBiBTc= X-Proofpoint-GUID: r59wVxL6v1uan8OLa4CD0ZFDA9MU0uRA X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-22_03,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 spamscore=0 malwarescore=0 clxscore=1015 phishscore=0 bulkscore=0 adultscore=0 lowpriorityscore=0 impostorscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220293 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=lists1p.gnu.org; Received-SPF: pass client-ip=148.163.156.1; envelope-from=farman@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_H4=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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1790108300931158500 Content-Type: text/plain; charset="utf-8" The various indicators pointers allow them to be overwritten, but leak any existing structs that might be there. If indicators exist, ensure that they are released before setting the new ones. Both the regular and adapter interrupt paths check that they aren't being asked to enable interrupts when the other one is enabled, so just do this release once all the potential checks are completed. Cc: qemu-stable@nongnu.org Fixes: 7bca3892cb ("s390x/virtio-ccw: reference-counted indicators") Reviewed-by: Matthew Rosato Signed-off-by: Eric Farman --- hw/s390x/virtio-ccw.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index eb6378ea4c..f46f936150 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -582,6 +582,11 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) if (ret) { break; } + if (dev->indicators) { + /* Need to remove existing indicators first */ + release_indicator(&dev->routes.adapter, dev->indicators); + dev->indicators =3D NULL; + } 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); @@ -606,6 +611,11 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) if (ret) { break; } + if (dev->indicators2) { + /* Need to remove existing indicators first */ + release_indicator(&dev->routes.adapter, dev->indicators2); + dev->indicators2 =3D NULL; + } 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); @@ -666,6 +676,17 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) } else if (thinint.isc > MAX_ISC) { ret =3D -ENOSYS; } else { + if (dev->indicators) { + /* Need to remove existing indicators first */ + release_indicator(&dev->routes.adapter, dev->indicator= s); + dev->indicators =3D NULL; + } + if (dev->summary_indicator) { + /* Need to remove existing indicators first */ + release_indicator(&dev->routes.adapter, + dev->summary_indicator); + dev->summary_indicator =3D NULL; + } thinint.ind_bit =3D be64_to_cpu(thinint.ind_bit); thinint.summary_indicator =3D be64_to_cpu(thinint.summary_indicator); --=20 2.53.0 From nobody Sat Sep 26 19:59:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1790108272; cv=none; d=zohomail.com; s=zohoarc; b=ZIk47GxlLx/nsFS2noB/iki2C589iJOqn3RzPw0iyoAIrHdAGIBijVz1mnRBLg/cBkEpsJzaiXVuCMl6A7wzAA7YD2e2KlImKQsH7aAdPIbe+j9iSBDAyBaqtG256czQ6MD1RQo3wCn9+f0eiA+lORBSy4eHq1c9wuQbCQNlMXw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108272; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qyRP9gix4X7Wva7VDC0mSmWL3CSHNCxNFONlLaz7Krw=; b=gDpberpbiFmfQi+5W7iz1SVZ17ZmCOyPPZE6iLg2bvUPX5Wl4CvzgSjJvgAMb1rTw6QBNZQWp8uUZniCU3Stn4ysmu2QbxvGMvquTtpVJNHk//DXv3XEz4oYbBc2jcDHdbYd316IITUOg2Z3Q4NxhBP2AtzAXBSzwibtkMovBTc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790108272190262.1889830746676; Tue, 22 Sep 2026 13:17:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96vN-0000Ey-N9; Tue, 22 Sep 2026 16:17:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96tu-00081t-36; Tue, 22 Sep 2026 16:15:38 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96tr-0007fe-5u; Tue, 22 Sep 2026 16:15:37 -0400 Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68MI7Rdx3447527; Tue, 22 Sep 2026 20:15:32 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4gske1qsh2-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 20:15:32 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.11/8.18.1.11) with ESMTP id 68MIHWEe1972713; Tue, 22 Sep 2026 20:15:31 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4gu5bkdw1f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 20:15:31 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68MKFR8C26935668 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 22 Sep 2026 20:15:27 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 958EC2004D; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 791D62004B; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav07.fra02v.mail.ibm.com (Postfix) with SMTP; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4958) id 62E40161539; Tue, 22 Sep 2026 22:15:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=qyRP9gix4X7Wva7VD C0mSmWL3CSHNCxNFONlLaz7Krw=; b=oes62qCwtlH59yh+F//Gd9CD58wlsgIq9 rCzmZCc7foMtAFpLRnUr1TGkmUxgAIzQRml/KMRKdiqvffC9ZEWmcWwcG6aXyAV1 2nljzmgO7Rz/JGDOVt8tp5LgVk39jwi/bXf/LewRMUdZ5QcxU6q2876C6P9d7RBu TzedfjdTNRb7EFTQGeNlRc6gquwBGy9insI+xHz5U8ITH4vdiZ27EQwViHzIDqDM 3SbOP2w0NZpSWjfrLnuKGx84qN0xzghhblIh36dgw4cl8Moxm8os8ucHR3ToQZOw GPMDMlQH+BY2Eq5sWWbz9k2Sgx1374z6CjjTFHgExV/qffpHa3Ieg== From: Eric Farman To: Christian Borntraeger , Matthew Rosato Cc: Cornelia Huck , qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Eric Farman , qemu-stable@nongnu.org Subject: [PATCH v3 3/9] virtio-ccw: Fix rc check in read configuration path Date: Tue, 22 Sep 2026 22:15:19 +0200 Message-ID: <20260922201526.2383047-4-farman@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260922201526.2383047-1-farman@linux.ibm.com> References: <20260922201526.2383047-1-farman@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: fXkTB_ux423T4xZx6yWtY9rTa3fY6pdh X-Authority-Analysis: v=2.4 cv=EOCTQFZC c=1 sm=1 tr=0 ts=6ab2e1e4 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=69wJf7TsAAAA:8 a=VnNF1IyMAAAA:8 a=uiMiztMkydEs4ieJCJEA:9 a=Fg1AiH1G6rFz08G2ETeA:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDI5MyBTYWx0ZWRfX+chpqejnXT3G P9TcRJQyGdQGGnxHyMewOpaRW3u7tyBu+AWyoRr3O63xHwlmDbwatcPvMk/aDytWGTIhf0BgsWe caFAfowCgieR87yUA8RPSNodX3F0uZ0= X-Proofpoint-GUID: fXkTB_ux423T4xZx6yWtY9rTa3fY6pdh X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDI5MyBTYWx0ZWRfXwTmNNKm/9FHE Z6OgCl9towVxO/SKaY0+JZ07sP6UL7dyd084l+4ZLuDLPVCofKSASzLFi32aXigFjB/S+8Nb32d ZjXruv725gkQAXzaEXdeSrXPuGRmPDiJ7ntt4XjajgfiMj3cIdeFTmuld2j1Ao7wfUrIoqwmvtD nXhl/7oWPjlleU3vIXXhTfvFoDv7ONFNJrCs96aRvNnJNKgqgKPG+IxF6nO0HYeyJpV1AS7gHM/ Lc9Gn7owvWnO1bb3Yzwl9+PQ8K27/aVXEsMS0v+I+ztNlCjiU8xR0Hz55Q76g0DA+diDfRFx6yD DASt/ctmpjz6IrFP3krcDXBeUfnYLb8IfoR3oPfaUhXtzWzpgugM1Or49YXGPMSjUtvSCozRUD2 dGn9azIsaUHdZ3biOxiCGrPrqYgB4iQs5LzwXxSOVOeLKesNQBswCF1LaY9ZQleoIF6ceUgDt+I BgOXmGu2EUw7Xr5JJQA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-22_03,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 phishscore=0 priorityscore=1501 clxscore=1015 spamscore=0 adultscore=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220293 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=lists1p.gnu.org; Received-SPF: pass client-ip=148.163.156.1; envelope-from=farman@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_H4=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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1790108272809158500 Content-Type: text/plain; charset="utf-8" Both the read and write config paths use wrappers around cds->op_handler, depending on the direction the I/O is flowing. But they expect opposite values in the returned variable to indicate success. Fix this by unifying those checks, where CCW_CMD_READ_CONF needs to see !ret as success. The end result is some erroneous data in the SCSW response data, but the overall success/failure is correct. Cc: qemu-stable@nongnu.org Fixes: d895d25ae2 ("s390x: css: report errors from ccw_dstream_read/write") Reviewed-by: Matthew Rosato Signed-off-by: Eric Farman --- hw/s390x/virtio-ccw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index f46f936150..11441e56c1 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -475,7 +475,7 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) } else { virtio_bus_get_vdev_config(&dev->bus, vdev->config); ret =3D ccw_dstream_write_buf(&sch->cds, vdev->config, len); - if (ret) { + if (!ret) { sch->curr_status.scsw.count =3D ccw.count - len; } } --=20 2.53.0 From nobody Sat Sep 26 19:59:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1790108278; cv=none; d=zohomail.com; s=zohoarc; b=SlgAqO4I2I1asiwMObvWv1Cw/2FsXGf318TzddgZ/E7Q4pf6V9asTIL8Ux36tYXaHXSpdCZ0Tbx8AQJeCFgO745UDxrVo59NbkrXVm98xgTjDEd7M98zNPaEDg5bJLdplgPwGKBaMNazKy5HTu0nnTjxyoJXLNtyIfDs/Ce96IU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108278; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hbKLXDVe/JdietrQfg9C30EtOc49ilGcFKU3mWEKI0w=; b=ChnI+7Kdybm4EpuKpLJRdg1eyPJMUPgQXoQyrIzJsVNyk3d8SXHn4Tss41pM3QL1642LM0cnqG+UIIlDlplit0eA985UL7X1yzGPG+fqYFReS57p+UkXkAexpftfT3JTpYsZKdFLYHfu0uC47c54u8+CGPErFEL9BPN7DXNKpm4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790108278677299.70247919931046; Tue, 22 Sep 2026 13:17:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96vO-0000GD-V8; Tue, 22 Sep 2026 16:17:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96tu-000823-NZ; Tue, 22 Sep 2026 16:15:42 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96tr-0007fg-Dh; Tue, 22 Sep 2026 16:15:38 -0400 Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68MI86R3966047; Tue, 22 Sep 2026 20:15:32 GMT Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4gske1fgds-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 20:15:32 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.11/8.18.1.11) with ESMTP id 68MIHYTm3198577; Tue, 22 Sep 2026 20:15:31 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4gt5qjuba2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 20:15:31 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68MKFR5Y46924154 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 22 Sep 2026 20:15:27 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A6FF120040; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 821712004B; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav01.fra02v.mail.ibm.com (Postfix) with SMTP; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4958) id 65342161561; Tue, 22 Sep 2026 22:15:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=hbKLXDVe/JdietrQf g9C30EtOc49ilGcFKU3mWEKI0w=; b=KqY7cEU8KrzDXjECIQSR74hn4ouqEOXQn JFV+OfAvlvpU0BqoFpLPhigh7JJk5gyKMJiyuGhmFAm1AcBkbFwSuckRvX3ZivXi VGruUWBLXZfcWcnHqUHh9dLjD7FntUou2MUEGsKi02SGtxCSWCdwVJ2U8vImVrZv Rdp4WoTrmDAiKtjP1cMi6bqV7EHhKg8wJm8CzWCs6BBo/JGDCkgIrh7BUdorRHM3 OS7lcUf6gXNO0XV7c7gCvRI1+PRLbLqB6mAbenZYeB++tXy2MLoozmWyCwCXVzwn hav6cNFw0ulcstIo4pQpBgFmZgXetWMMjV0flLMPCTbMi3olF5AUA== From: Eric Farman To: Christian Borntraeger , Matthew Rosato Cc: Cornelia Huck , qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Eric Farman , Anthony Krowiak , qemu-stable@nongnu.org Subject: [PATCH v3 4/9] vfio/ap: Clear error object pointer after non-fatal errors Date: Tue, 22 Sep 2026 22:15:20 +0200 Message-ID: <20260922201526.2383047-5-farman@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260922201526.2383047-1-farman@linux.ibm.com> References: <20260922201526.2383047-1-farman@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: FVRxDRKOTw7HzR2squYY0FV4bxhq6gKC X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDI5MyBTYWx0ZWRfX+Af+w9RoWuFB H6PRMlDVyTUr1cHNyTLrihGT5Ya3XneScYmzXBbroiVmjW5hMN7JFO4HxjxbfGrQLkjEwPKY/aw ZIJzG6B7smtONHmlApPwUxM6RoISdK1U31iESd2r5THaKAvyDEkxgLCJiqWgEw9dCYCzrW8XPiP /77VJD/KpBksIIoiMxjTg9G4urlQ1MiKcJW//nMLl7z+5MFZubJ2mtFx9w88ygJ/GxhVa35OZSJ 7FFOswv9IcBPhtGi0+pMs3pwyc87QJKX9nHyWeD+NVTa4qou9xOwvr1Eep34/Oo7Y5EaC+6svV2 lTWVNZCp96Yy3xGUV91MqUpEnmXrxw5eNjXbqjaYadYrJMPDTqjEHNX51eMrcEYZp21d+zZoFi9 zomSAxUAduYk0SCJSECTq44toVzebslZzuUx/pCLt0Se7b7IHMUezAy1P7ar9gXPqs0dpgSRe+1 fQdJK0sEICviPiYvBBQ== X-Authority-Analysis: v=2.4 cv=O/KsLx9W c=1 sm=1 tr=0 ts=6ab2e1e4 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=69wJf7TsAAAA:8 a=rlruftgHjx7kiOjKd_sA:9 a=Fg1AiH1G6rFz08G2ETeA:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDI5MyBTYWx0ZWRfX/ZwtH9UH1A58 yhUIpLppSmvrMiBkqOAe48bAgEfMPMR4UPenxqPkTUzZUEyHVfQAdGoOGmEeD3Ylp82tl0UGG/X YS5YrspniQpUra3r8tG2fNjoqst70sM= X-Proofpoint-GUID: FVRxDRKOTw7HzR2squYY0FV4bxhq6gKC X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-22_03,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 malwarescore=0 phishscore=0 impostorscore=0 suspectscore=0 bulkscore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220293 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=lists1p.gnu.org; Received-SPF: pass client-ip=148.163.158.5; envelope-from=farman@linux.ibm.com; helo=mx0b-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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1790108280889158500 Content-Type: text/plain; charset="utf-8" Registering a new IRQ notifier will allocate an error object if needed, and warn_report_err() will release that memory once it's finished. The pointer remains, however, so subsequent errors after the non-fatal errors in vfio_ap_realize() would cause an assertion failure for a non-NULL pointer. Fix this by clearing the pointer once the warning has been reported, to reset the state of the error objects. Cc: Anthony Krowiak Cc: qemu-stable@nongnu.org Fixes: 1360b2ad1f ("s390x/ap: Wire up the device request notifier interface= ") Fixes: 0fb8a62fe4 ("hw/vfio/ap: notification handler for AP config changed = event") Reviewed-by: Matthew Rosato Reviewed-by: Anthony Krowiak Signed-off-by: Eric Farman --- hw/vfio/ap.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index 6e2a1223ea..2926e04ad4 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -247,8 +247,10 @@ static void vfio_ap_realize(DeviceState *dev, Error **= errp) /* * Report this error, but do not make it a failing condition. * Lack of this IRQ in the host does not prevent normal operation. + * Clear the pointer, since the warning will release it. */ warn_report_err(err); + err =3D NULL; } =20 if (!vfio_ap_register_irq_notifier(vapdev, VFIO_AP_CFG_CHG_IRQ_INDEX, = &err)) @@ -256,8 +258,10 @@ static void vfio_ap_realize(DeviceState *dev, Error **= errp) /* * Report this error, but do not make it a failing condition. * Lack of this IRQ in the host does not prevent normal operation. + * Clear the pointer, since the warning will release it. */ warn_report_err(err); + err =3D NULL; } =20 return; --=20 2.53.0 From nobody Sat Sep 26 19:59:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1790108236; cv=none; d=zohomail.com; s=zohoarc; b=PeVsuT9NEUJxoLp6HlxKG80nmoOYqfN7+cYQ38kV9l4zsIV3BUhlhEIborpgktu4DyVJO85wJcFC2bD8zHSgx2Gb/hAurDedLYRHtdivSAzcLjPrMWg3NEjXh5684CQ1gQFy+k8saBMJavbgaNM01br+SAeaeYeG8xL5ZBnqd4E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108236; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vRIXMRakBGJfbZE8ZDtYsNbMqHwAb87+JJN6vShZ2FI=; b=fgGb6HIts5c5KqOYiB+N0LmgGX4YDXFqzTI47rntS5s1AzXAKj5eqoTGC1kVDYNiumNH8iklB/hlKKuzYAVsePH367LwerPSVayhloNeZT35BYK5wsqBjVuycQ4oQxl0Z8IEWMviFoInMZbP34oeRI8Txrnxxc1BYvsV/WabXIU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790108236550322.1335911466671; Tue, 22 Sep 2026 13:17:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96vF-0008SW-Vo; Tue, 22 Sep 2026 16:17:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96tv-00082A-SL; Tue, 22 Sep 2026 16:15:44 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96tq-0007ff-RQ; Tue, 22 Sep 2026 16:15:39 -0400 Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68MI78RH1128992; Tue, 22 Sep 2026 20:15:32 GMT Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4gskgs7sey-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 20:15:32 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.11/8.18.1.11) with ESMTP id 68MIHZhe4187977; Tue, 22 Sep 2026 20:15:31 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4gt7dyb3ms-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 20:15:31 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68MKFRAl53477768 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 22 Sep 2026 20:15:27 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B918A20043; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9DF272004D; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav03.fra02v.mail.ibm.com (Postfix) with SMTP; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4958) id 679421615CA; Tue, 22 Sep 2026 22:15:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=vRIXMRakBGJfbZE8Z DtYsNbMqHwAb87+JJN6vShZ2FI=; b=PZd2kWXoK/5jwxU21ku1uDFyZH5oQftAr kqEQeYkYOZ3v4d41AEPoKbMr9o2RdZMa6fEQ1S2JA+PNL4ZctfqLWwOUWubu7dvj HPxgw44u9qgOrYW5fK/xkG9leM4htpWdiSWDkcWh8PU9H+AiTwZAkb78t6yNRMrW tqoWR9GZXvaR5EMH2fSJmpduS9PUxCBkQsooVag1DwAPFmKYbBG3C+0W67M45Wg2 +2Yss9WMjB9g+qhX7y07hM9Un8tffI4fjvuwjxpsjVafx5QbZ7QsKutPt7xQcxz/ +jnyjyOq+wNmyvpM+jX4Pv9cjSBSy3lpBaeFEc0cbrAjWPZAFDpBQ== From: Eric Farman To: Christian Borntraeger , Matthew Rosato Cc: Cornelia Huck , qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Eric Farman Subject: [PATCH v3 5/9] vfio/ccw: Clear error object pointer after non-fatal errors Date: Tue, 22 Sep 2026 22:15:21 +0200 Message-ID: <20260922201526.2383047-6-farman@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260922201526.2383047-1-farman@linux.ibm.com> References: <20260922201526.2383047-1-farman@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=V/XoQuni c=1 sm=1 tr=0 ts=6ab2e1e4 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=WuYEg3pJWr1ZmXxL5igA:9 a=ZXulRonScM0A:10 a=zZCYzV9kfG8A:10 X-Proofpoint-ORIG-GUID: KZViQFp_MZZT2lDtrOoarV87EXByY6sj X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDI5MyBTYWx0ZWRfX2HXIC7ybk0BN Uui4/ppqjFur5iS9RBGe7iIY/MbNE4N/pwhnmMEvnTFTub35Zk7en59eH0Inn0xqpet5RiR+8iv U2Rdv7B3JlB+kccl0OqfoHSGWkw0A3X3v/elNdH6rkKVzqGYEGj9tOAMjMp7phkh9m3q6WLF1nw BpO9g2zhtGyyOcrPRAqEj2FzskkSRH/moDCAa9WiBLsofOlpkzwG6WKXya/A7c90GAc5BDs0AKU sToH43boWj5PRvuj9AnIG5h/nhBBNwYEhSi6niIMiVyK3iWNLenQaSEMsgN4I5tSc1QvW/AuoCi qseWZiSAuVMjqKMTCPj74fi/4+KTsYqMc+hv8VWOU18xACYdWD/PXfuxNRTajJ4UGAHdCjH7BY1 4pbJGVN5SjsWeVxFk0/YBere7kadwcmD7ULdbvjZXx0WPV+Bg8oJgOWCd0YMuwOsAVF0638rmeu sYBpqaShHpjmpoAYiRg== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDI5MyBTYWx0ZWRfXy6P/kkpdWaiW JoNZG8mOtnFN/7pk3w6t6XDh01mH894O+n/HFxrJCzr9BX0B/pXOXGENfVKTLKYfJbknvCs+KWY HxZj+kmtme90ZPifPTvon9weuK6j4d8= X-Proofpoint-GUID: KZViQFp_MZZT2lDtrOoarV87EXByY6sj X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-22_03,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 spamscore=0 malwarescore=0 clxscore=1015 phishscore=0 bulkscore=0 adultscore=0 lowpriorityscore=0 impostorscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220293 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=lists1p.gnu.org; Received-SPF: pass client-ip=148.163.156.1; envelope-from=farman@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_H4=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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1790108238942158500 Content-Type: text/plain; charset="utf-8" Just like in vfio/ap, there is a non-fatal message that could be generated, with a stale pointer in the error object variable. Unlike vfio/ap, there is no secondary message that could attempt to use it. Clear it in the same way, in case that ever changes. Reviewed-by: Matthew Rosato Signed-off-by: Eric Farman --- hw/vfio/ccw.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index c3dc7c1962..8e29a3ae61 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -604,8 +604,10 @@ static void vfio_ccw_realize(DeviceState *dev, Error *= *errp) /* * Report this error, but do not make it a failing condition. * Lack of this IRQ in the host does not prevent normal operation. + * Clear the pointer, since the warning will release it. */ warn_report_err(err); + err =3D NULL; } =20 return; --=20 2.53.0 From nobody Sat Sep 26 19:59:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1790108292; cv=none; d=zohomail.com; s=zohoarc; b=kMuH22HijZrgycUgAK0Ap0IqM/tBUEobUV9KzBpLNEk6r1dBLFrGqGFtDLoGGaOspr4ijAXHXzLEDjwb1//uHlZBMkbHHWPa5zSfLuxeKu3S36pzMQ57D0cBmSJy+0qGEsX9BODTdo4uwDIlYiXIIOLVqBLAasvIn+nbg2v85Nc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108292; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=mkK0xTEskoCAyutOOi+o0+xNrxuIKwK4f3orGfmD+0I=; b=A0yK/4mv3IzW57qQykh1ZdI1eV0OTFezR5v+c/kxM+DP1AgmMunDdWlCU9jt19qRrv+DV67m8u7Gdhd9n7laocQN3e+mz+kHRCvIE2yWZbfjiHBPTO1F8CpDmO5X69a1Ob3phB9ExN7BYqPbwICW/hKpJ0UPy3gpl4kxtk5aWsI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790108292255227.95962745077418; Tue, 22 Sep 2026 13:18:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96vK-00008t-Nr; Tue, 22 Sep 2026 16:17:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96tu-00081v-5Q; Tue, 22 Sep 2026 16:15:39 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96tq-0007fa-W4; Tue, 22 Sep 2026 16:15:37 -0400 Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68MI74Ao4143497; Tue, 22 Sep 2026 20:15:32 GMT Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4gskgqfd57-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 20:15:32 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.11/8.18.1.11) with ESMTP id 68MIHceK3279472; Tue, 22 Sep 2026 20:15:31 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4gt4qqbfe1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 20:15:31 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68MKFRab26673550 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 22 Sep 2026 20:15:27 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B946D2005A; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9E2A22004E; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav07.fra02v.mail.ibm.com (Postfix) with SMTP; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4958) id 6A16F1615D2; Tue, 22 Sep 2026 22:15:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=mkK0xTEskoCAyutOO i+o0+xNrxuIKwK4f3orGfmD+0I=; b=UqXXWBxc8BPeeOo/A/aru0A3lvWtrsMCC Knq7uma0FOg96+OVw5haSko6uqbwBbwtTJdJkfkDxB3K/bLbfXLzrFhnkWM8lcHU 5kF1QWKrh1tcOjxdBo1zxsKf+UZ4pEpMZxnd0beW4m4uOzEq6w/3jpvl1cvJDbEq ya7L1yF63WNFhbV3CLdKT7oLbHttxFgrDYDnaOLjUrmnTEyg3E0czdzrRxvE09o8 BRCHcQSIUCq+sgpqaei3O+e9CFlC4frPeRP+J4Aula8vlNnJoK6RTDSR7CtgYBIb vg+CVFluIboVlfqCfk+4xv2gIvrdsX3lb4aUHaZ0fjapU7YUJZ0tQ== From: Eric Farman To: Christian Borntraeger , Matthew Rosato Cc: Cornelia Huck , qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Eric Farman Subject: [PATCH v3 6/9] hw/intc/s390x: Fix payload to KVM_HAS_DEVICE_ATTR ioctl Date: Tue, 22 Sep 2026 22:15:22 +0200 Message-ID: <20260922201526.2383047-7-farman@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260922201526.2383047-1-farman@linux.ibm.com> References: <20260922201526.2383047-1-farman@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=G+OJgNk5 c=1 sm=1 tr=0 ts=6ab2e1e4 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=cb2EWknS8209ijoe3xIA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDI5MyBTYWx0ZWRfX8DLLxDBl0eCS zXSIobuAS5t6oEFuu9etUUV8dLa7zHkt9L8lrmH8e9v7hB6Tyi06+RWJi1bV0bZeIBoHSu/IMXO RCiG8dCnDfkAzc7dl5X9pQkkZZ9X2qGYSn6Z/gaB7MuI8RmjnsdxssOpev+wRbsUMbkBj3BvT2W dRW+wGCuMZMdXdjKT6vZfGArqgfv55rSdk46V0paoov2nCuspZmq3grI8zyHgDgllcwHIp2VgrY sTsQyojGFVDyBkhMCbK5+p7GoYRZQZ8jZoBeNcqIl0t+3vbGA1rgJdwozlqHPeks/jxnIpZ52Na owsdiJQPyBCytJ9tzqF7E27RxPnqqzsb72Nec0/r3GA78/uUNtdEBNq2UObOreyUNpi8jryFqki n7IjIaDZ93ssemjVVq1YmjOvxq+CHjgsTzPbgrtaeY0Z+2VKQIw6yLTipEeCLTgTGZOz6FtwFkt AErMkectpCWPR9KdBsg== X-Proofpoint-ORIG-GUID: AdLDTlLL2wmf81QHKQONV-bco-3gDKhH X-Proofpoint-GUID: AdLDTlLL2wmf81QHKQONV-bco-3gDKhH X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDI5MyBTYWx0ZWRfX0boqVUOqpiAx USCZJnjzaVYewxsRavnOGqNd33olIl+/EOfDjf7CFA9o1pUjuAtWh4bjrT+9yfbWOAYH96Fg3XT ZGbaXw0Cz819vrQ3hcbY/683fV8qoJU= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-22_03,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 adultscore=0 phishscore=0 lowpriorityscore=0 impostorscore=0 bulkscore=0 priorityscore=1501 clxscore=1015 spamscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220293 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=lists1p.gnu.org; Received-SPF: pass client-ip=148.163.158.5; envelope-from=farman@linux.ibm.com; helo=mx0b-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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1790108292985158500 Content-Type: text/plain; charset="utf-8" The ioctl to determine whether KVM_DEV_FLIC_CLEAR_IO_IRQ is present receives the contents of the attribute struct as its payload, rather than a pointer to the payload itself as is convention. This may result in erroneous errors from the ioctl, which would result in clear_io_supported being false when it otherwise could be used (which is helpful in device recovery). Reviewed-by: Matthew Rosato Reviewed-by: Christian Borntraeger Signed-off-by: Eric Farman --- hw/intc/s390_flic_kvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c index f833a3996a..5e6d422fba 100644 --- a/hw/intc/s390_flic_kvm.c +++ b/hw/intc/s390_flic_kvm.c @@ -633,7 +633,7 @@ static void kvm_s390_flic_realize(DeviceState *dev, Err= or **errp) /* Check clear_io_irq support */ test_attr.group =3D KVM_DEV_FLIC_CLEAR_IO_IRQ; flic_state->clear_io_supported =3D !ioctl(flic_state->fd, - KVM_HAS_DEVICE_ATTR, test_attr= ); + KVM_HAS_DEVICE_ATTR, &test_att= r); } =20 static void kvm_s390_flic_reset(DeviceState *dev) --=20 2.53.0 From nobody Sat Sep 26 19:59:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1790108272; cv=none; d=zohomail.com; s=zohoarc; b=X0GIyidNsvv1Kp+ckJwMs5Enexq/VqPTPek3bwAgJwwsTMbyrB0X+VXq8lvnk02Q7mkRXcewcwCxTR2039pPCxTDH8V5Vs8EKdJ+V0NDcTdhw8y1smK2p//74mixTiKEiSwI3bzrOyesi3JjjsbIaH5i9Ta/GTDKUDZEKnoJsqo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108272; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=JMdkwqD9Zszzk7iBTrGR4/pIMvEXuGW8BOWpT6++kFc=; b=DbklLPEppvk2ail9XSON9MJXSsTxCPLJFilQdjO6u33jR6SZ3VnA1Vla6FiP75n19RVnTzQgLIsnYMO0XNzujWcVSPQicUOH2CxBCcoLkFdNyy0YEOzkz2ZLTOCXIQKCcK5xlIuUkL0599Dacp3+91It9ZtTAfCOCSIbJpLA9bY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790108272263685.7412491659161; Tue, 22 Sep 2026 13:17:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96vC-0008O2-7C; Tue, 22 Sep 2026 16:16:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96tv-000826-AA; Tue, 22 Sep 2026 16:15:42 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96tr-0007fw-64; Tue, 22 Sep 2026 16:15:39 -0400 Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68MI7HKo1129652; Tue, 22 Sep 2026 20:15:33 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4gskg2ftqx-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 20:15:32 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.11/8.18.1.11) with ESMTP id 68MIHY643220305; Tue, 22 Sep 2026 20:15:32 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4gt53vkdxd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 20:15:31 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68MKFR4J47972798 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 22 Sep 2026 20:15:27 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BE3852004B; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A085D20049; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav06.fra02v.mail.ibm.com (Postfix) with SMTP; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4958) id 6C7E716162C; Tue, 22 Sep 2026 22:15:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=JMdkwqD9Zszzk7iBT rGR4/pIMvEXuGW8BOWpT6++kFc=; b=QAkQaAPYjePZ25Wak7btQpNY0E6NH88nq yJ6WoyUsLsTnxl67/ryGsYjPF/ThTqhEDTtGmtnGNk4vPxM4RSE40sgGNnCjFhsH DprMEfFX0LobklIND/0R1GVfAouE10WlhfMk4CnjkA5GA5V5wIaiZJTMUaI/xuF0 4//mXSsrd/y9wJk7ssDEaNKjlJ+k7cRgYjC4Xj+i7u0rveFxLabQqkfZMUDCRz4W 5ixD90d4rh9//G86CkHkhMJzvdgxcDR1Hzt9aCJOH8uvl0k1ImkqFQZoKV+qfqP/ S1cyURu62UrwteDmy6/4nKCD355+Y91xtoJxwwjLDhXFp+KQrC2Og== From: Eric Farman To: Christian Borntraeger , Matthew Rosato Cc: Cornelia Huck , qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Eric Farman , qemu-stable@nongnu.org Subject: [PATCH v3 7/9] hw/intc/s390x: Fix check after g_try_realloc Date: Tue, 22 Sep 2026 22:15:23 +0200 Message-ID: <20260922201526.2383047-8-farman@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260922201526.2383047-1-farman@linux.ibm.com> References: <20260922201526.2383047-1-farman@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 77atNcqF2nOwGP3xTj4upL2QDml00iEy X-Authority-Analysis: v=2.4 cv=I43w19gg c=1 sm=1 tr=0 ts=6ab2e1e4 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=69wJf7TsAAAA:8 a=VnNF1IyMAAAA:8 a=M8FnGKaJMcETolB0Q_gA:9 a=Fg1AiH1G6rFz08G2ETeA:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDI5MyBTYWx0ZWRfXwg41jtBfXNmC R3dRpw06EJHD4SJnMmNDM4RHHi25cEXR9fLPX+UcpcfmQWejqSqtvDfzqgoAyl4qtglV6RjBL9H SDhWS/jtNTNs86q8QfGLl4229sX/Ju1UDUwNUWVjutUi1o2k3QVZX98Wit2fr3BbDID4YVYpM+1 z0Gn3Qy2RA2u61mbUwLHBI+7nykeq1WFEKWo+A/ViIBC7/ym4bQFxYwx2njqWihIevS0rXWwWCQ PQOUU43m7UVhemIqRjwiR6Y1HzBjaEHGRrIIh+8hff43d76jGqGYQINHw3YlDuI6X/zw/im+ZYj ri3lCwFZQMFDOWy326oFsI33otxJVuHxEPZNTXsC7hgHwRMgbIcPSp9Dle68ur2N1kuWug+CIpI v3uNPrxcXAJIBZrP/Rdni3DefIpQLqZCjDEO6PfyDmURUUSdk4XDT4RWkxYRi158QxHmTjkU9yl YWPwIqxeXYKryklGtTw== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDI5MyBTYWx0ZWRfX0BRwt/2ul0be G48gh4yKcw8sJFy/0DOPi7KY/PVOO0syqb5njDoW0BC55yCffaOKMrTc7pq8Cnlz5fxFmcYV2Iq LkKFJILj92Lan0F7UAwIOiXExuXOG2g= X-Proofpoint-GUID: 77atNcqF2nOwGP3xTj4upL2QDml00iEy X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-22_03,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 clxscore=1015 adultscore=0 suspectscore=0 impostorscore=0 lowpriorityscore=0 bulkscore=0 phishscore=0 priorityscore=1501 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220293 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=lists1p.gnu.org; Received-SPF: pass client-ip=148.163.156.1; envelope-from=farman@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_H4=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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1790108272813158500 Content-Type: text/plain; charset="utf-8" The loop to store pending IRQs uses g_try_realloc() to expand the buffer being used, but the returned address is stored in a pointer-to-pointer, thus the check is supposed to be examining the contents of the pointer, and not the pointer itself. Define a temporary variable to catch and test the returned pointer. If it's NULL, return to the caller to perform the free on the unmodified buffer. If it's not NULL, store it in the caller's pointer and restart the loop against the new struct. Cc: qemu-stable@nongnu.org Fixes: 3a553fc658 ("s390x/kvm: implement floating-interrupt controller devi= ce") Reviewed-by: Christian Borntraeger Reviewed-by: Matthew Rosato Signed-off-by: Eric Farman --- hw/intc/s390_flic_kvm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c index 5e6d422fba..63c6ce81d9 100644 --- a/hw/intc/s390_flic_kvm.c +++ b/hw/intc/s390_flic_kvm.c @@ -254,6 +254,7 @@ static int __get_all_irqs(KVMS390FLICState *flic, void **buf, int len) { int r; + void *new_buf =3D NULL; =20 do { /* returns -ENOMEM if buffer is too small and number @@ -263,10 +264,11 @@ static int __get_all_irqs(KVMS390FLICState *flic, break; } len *=3D 2; - *buf =3D g_try_realloc(*buf, len); - if (!buf) { + new_buf =3D g_try_realloc(*buf, len); + if (!new_buf) { return -ENOMEM; } + *buf =3D new_buf; } while (r =3D=3D -ENOMEM && len <=3D KVM_S390_FLIC_MAX_BUFFER); =20 return r; --=20 2.53.0 From nobody Sat Sep 26 19:59:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1790108280; cv=none; d=zohomail.com; s=zohoarc; b=m6VE/GD8ITEpd5h9ZwJCto7K/iu2RShOlMziOWSE4/FVAy2aM77l1WOtWFr15SVpR/byAfw+Wtky9VPKA2I5n1LnK3Wm5BqKDz6GjTrcld7c7ciQIxkjA0zNHorgEXUYOW59EGL+JlItj8D64kjBRUCoaiLchHHQLBEdAUUFAhY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108280; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rSD/N+0aF/+pV1sSzti4NYglqvruBGeICmLxp/1KjrQ=; b=n2BGmQX1OZAjsUJFP9Po4Sbr1e4VRLY2B7H6gHyCx+Rgf6RPckYbYzODRV02Vf1NkrLnbeeHOqFK1C3j7oaXmD1U2zwF+FHaNgNC3hZxnbK56MQheutZBOKfmUDtqUJhqd+Dmild6vbbfj3tuZssdxQLcNYag9TmlwN3gyvfPYg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790108280234851.905086174779; Tue, 22 Sep 2026 13:18:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96vJ-00007U-Bd; Tue, 22 Sep 2026 16:17:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96tt-00081k-Jy; Tue, 22 Sep 2026 16:15:38 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96tr-0007fs-Ao; Tue, 22 Sep 2026 16:15:37 -0400 Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68MI7Nqm3447412; Tue, 22 Sep 2026 20:15:33 GMT Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4gske1qsh6-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 20:15:32 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.11/8.18.1.11) with ESMTP id 68MIHiHo3198696; Tue, 22 Sep 2026 20:15:31 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4gt5qjuba3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 20:15:31 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68MKFR6h47776108 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 22 Sep 2026 20:15:27 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C0A2A20063; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9F69C2004F; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav07.fra02v.mail.ibm.com (Postfix) with SMTP; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4958) id 6EAD0161633; Tue, 22 Sep 2026 22:15:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=rSD/N+0aF/+pV1sSz ti4NYglqvruBGeICmLxp/1KjrQ=; b=RCi3+u3apv6yXtSFAlz5zkKOxWJ4kxpj4 2vWxZBNvD8r52nsE/gMn4RkoXxMGTG0mW0EFxvFod7NqYFqRyAO0r24LMdGzdwLI 6AV198nWKMojWcAHNZY/KEiv201PB1x2QY5iLf8NXLdrSJoAEN8bB52D1VIqj8pb wPuVkbF9nd9RL+T7q895SBJgLBdm8HG3XJcPydEOpJoC22xXlTPM4mV3EnTsk6Mm +VWqsdyygmQIJlAzLuOCy6SROWJdr00TltK37fnokSe8Gr0zY+kLGjeJcHd/fW6y HZdUcuq/qvw9iGUsLs4fvkllJdqPXGeVucQ6lNl6xOaJPC8P8/yVQ== From: Eric Farman To: Christian Borntraeger , Matthew Rosato Cc: Cornelia Huck , qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Eric Farman , qemu-stable@nongnu.org Subject: [PATCH v3 8/9] s390x/css: Use datastream pointer for checking no-data CCWs Date: Tue, 22 Sep 2026 22:15:24 +0200 Message-ID: <20260922201526.2383047-9-farman@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260922201526.2383047-1-farman@linux.ibm.com> References: <20260922201526.2383047-1-farman@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: ieVtyfM_BMBOnWqHfrqvh8pgcpkWyFPk X-Authority-Analysis: v=2.4 cv=EOCTQFZC c=1 sm=1 tr=0 ts=6ab2e1e4 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=69wJf7TsAAAA:8 a=VnNF1IyMAAAA:8 a=8cHL7K5PRkdKNGgrHUUA:9 a=Fg1AiH1G6rFz08G2ETeA:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDI5MyBTYWx0ZWRfX5b2STzotAgd/ sTfwYFytV3uf8dk8OA2tOGHnM2mPUatSzMPjHt5VHoqU4FedYR1l3u0q0xfwNkm/wdu9C5xDKiE JxrB4dHNMMHkhZMpuVnTVsB6M1b5YSk= X-Proofpoint-GUID: ieVtyfM_BMBOnWqHfrqvh8pgcpkWyFPk X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDI5MyBTYWx0ZWRfX9ZtBXD43jWQj 2gzlFomZL/GBX0nQ84BHyfwghwC1WZCssSGtnDYeEWl2g9zwYAJg8D4At+AnilrDhSDsz4NJefv pIO9IAstzcJ0keeXlr/2ne8OdofSQsPW4kc6P0C59TulePUOPGAmdxVUriMvrYOZT8B8s5HJEfj JjmgHTpvPDAJxysA+PlsDmu0LoSbN/Q23qNSQPhQVKJ9pCi+zHU6J/1doPZ2MqGeUCBgzE4ftu1 6QZKbyGwQJUAR9OQPjD7+iIHTvguaO9zGqAAY6bC9cVlfDD5psejsZ/jY84ZYX+pJDn8m0+DAwK VMj/6aVfNyR1uijmdLLbMkVLTkKmqa4TqIaefGqCAZJ2Jxa2uHcanKLuG3apsAT6tpqYKrwa+wQ pegujA/hM7Uv+JBMeNKVGUpbuED9eMIiDyaB/RNFo8qDLGxbMgW2X5JJRWWLm/JcQE/81zD6MFi H/DN0wcFVZWdhzIl+2Q== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-22_03,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 phishscore=0 priorityscore=1501 clxscore=1015 spamscore=0 adultscore=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220293 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=lists1p.gnu.org; Received-SPF: pass client-ip=148.163.156.1; envelope-from=farman@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_H4=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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1790108282994158500 Content-Type: text/plain; charset="utf-8" The channel subsystem will reject channel programs that incorporate 256 CCWs without a data transfer, but the existing check to account for this only does so for CCWs with a data address of zero. Other valid CCWs that wouldn't transfer data are not accounted for. Rather than re-inventing the wheel, use the output of the datastream at the end of the entire CCW parsing tree to indicate whether data was moved or not. Cc: qemu-stable@nongnu.org Fixes: e8601dd5d0 ("s390x/css: catch ccw sequence errors") Signed-off-by: Eric Farman Reviewed-by: Matthew Rosato --- hw/s390x/css.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/hw/s390x/css.c b/hw/s390x/css.c index 9da9128d88..65341c68c3 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -1016,13 +1016,6 @@ static int css_interpret_ccw(SubchDev *sch, hwaddr c= cw_addr, =20 check_len =3D !((ccw.flags & CCW_FLAG_SLI) && !(ccw.flags & CCW_FLAG_D= C)); =20 - if (!ccw.cda) { - if (sch->ccw_no_data_cnt =3D=3D 255) { - return -EINVAL; - } - sch->ccw_no_data_cnt++; - } - /* Look at the command. */ ccw_dstream_init(&sch->cds, &ccw, &(sch->orb)); switch (ccw.cmd_code) { @@ -1103,6 +1096,20 @@ static int css_interpret_ccw(SubchDev *sch, hwaddr c= cw_addr, } sch->last_cmd =3D ccw; sch->last_cmd_valid =3D true; + + /* + * A CCW that transfers no data is allowed, but ensure an upper limit + * is established to prevent long-running channel programs that don't + * move actual data. + */ + if (ret =3D=3D 0 && sch->cds.at_byte =3D=3D 0) { + if (sch->ccw_no_data_cnt =3D=3D 255) { + ret =3D -EINVAL; + } else { + sch->ccw_no_data_cnt++; + } + } + if (ret =3D=3D 0) { if (ccw.flags & CCW_FLAG_CC) { sch->channel_prog +=3D 8; --=20 2.53.0 From nobody Sat Sep 26 19:59:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1790108294; cv=none; d=zohomail.com; s=zohoarc; b=T/HzFqepCMFUecHix5UcEBYpLHuXDw+Bah1sxQ30dI5JDE7Wvi1CNdb9JgJdruSd/gC+w+f3Mag953KW/NSluUnnRCq3Ock2kplYo8K7NsREDDOck2DH1py/zRuKa6LWoy70sFHJdgz9GIeJFkIVsMm9lUO8GaEDmZ8CAoaHi/0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790108294; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=T+KQWmZPRoeO97lmdwaFzeiVaV6RDKH5Tl5to6h1b7s=; b=KqkuLrmrxQCUGZsPTMLmFhKsHNzGaYvalZcuxCIWkPDHP01nvyvWGMgg+aopMTU/OJkzU5fUIz98fpqbbQ8ZAVN4urU3GIUdSv0CrNv+6boZw4Nn6Ox6gOxn5VqDVu8liaaooOHoJM7JEIFjCeCDXtMI3E+EXIJ/nvwjM77wLgA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1790108294534613.4647142354887; Tue, 22 Sep 2026 13:18:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x96vF-0008Si-VH; Tue, 22 Sep 2026 16:17:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96tv-000825-8T; Tue, 22 Sep 2026 16:15:42 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x96tr-0007fd-CV; Tue, 22 Sep 2026 16:15:38 -0400 Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68MI733M1129089; Tue, 22 Sep 2026 20:15:32 GMT Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4gskg2ftqv-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 20:15:32 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.11/8.18.1.11) with ESMTP id 68MIHdPV3279475; Tue, 22 Sep 2026 20:15:31 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4gt4qqbfe0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Sep 2026 20:15:31 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68MKFRSd39256546 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 22 Sep 2026 20:15:27 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BF8142004B; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A19102004E; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav03.fra02v.mail.ibm.com (Postfix) with SMTP; Tue, 22 Sep 2026 20:15:27 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4958) id 70E59161693; Tue, 22 Sep 2026 22:15:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=T+KQWmZPRoeO97lmd waFzeiVaV6RDKH5Tl5to6h1b7s=; b=k3TXLp0sll4A8PgDEG9FXyR2KsDwbJR1z CPyUNcx/NuGd2lj9V97EWT21mb3Owi7INcQWooDfCHL02smaYIwWkebWD5Jis2kR WQSMstzwyx0bINZd4HShrrH6iw61M1ruygCuLVP7sjYh9kKyfAHlFfgrk4HO11vc M0WbNGPIcArLuC3PuqMNeqSqt8UanapGHJu3q6ERPcUp7A/zYCYkj9tUwIhU6+1X A+xN9QdINI/gXYXWpt+Xr/g0pLSMXUVKLrG05vxSKHNsxsVdGA0g3To8Z/Rs7NgR S3K6HZ6PNa90/8x48/7l3unjh/DpECnD1QlBUzyAso1VAbeCTqXpA== From: Eric Farman To: Christian Borntraeger , Matthew Rosato Cc: Cornelia Huck , qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Eric Farman , Janosch Frank , qemu-stable@nongnu.org Subject: [PATCH v3 9/9] s390x/sclp: Reject short headers in PV case Date: Tue, 22 Sep 2026 22:15:25 +0200 Message-ID: <20260922201526.2383047-10-farman@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260922201526.2383047-1-farman@linux.ibm.com> References: <20260922201526.2383047-1-farman@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: tq044Pqgty29OYlnCUfe_G2TlDMtf1cs X-Authority-Analysis: v=2.4 cv=I43w19gg c=1 sm=1 tr=0 ts=6ab2e1e4 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=69wJf7TsAAAA:8 a=pH6oLB8u_88KfPtTI8IA:9 a=Fg1AiH1G6rFz08G2ETeA:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIyMDI5MyBTYWx0ZWRfX27LNpG3HOzZf yxkDI7RyAWQZthOrxS/U+7rGw8OhyBf41QYszsYWVIk+KHSMKbgWW+6fvaTddBpZgXEvshUL0qT ZxSkIK0TVYrqSwuay0jbFV2GsYP4MuJGXdzTZ4mYFgRVdqdU5V46lRpFIwgRMYEVFCIPA0QafSR 4Gq86AaWp1KMPQ+nRGRDVc0XA0U+eTBQapdT4+6doMUYmHNssPyBpRj8wUFNL2Qh7rNkrToutJg WKy5YDfqIEQaWvQR9TAI1XJAxDW3XGJgcTwk7UQe8oMGUKBWclKBiuKMSemffoaOC3/AQKGNEeT SoCrQcMe38i3s++RdOAe9+fgYnUWzp5A7vv1QJXAJAM4TefMJTNVq3oG5jBrRX81R9seTKiBv1X yq1BA0yFU+vyiUPhSZscDt5lahd0wgksDyrondMHE33ZVpMMtsN5ZZ9UIPCHHz9s2Gbx0fwb0Zv WPCcPGpTaGMlZc6Rkcg== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIyMDI5MyBTYWx0ZWRfX8J2FBeIDMj1K hM7q3mjxM4LfCSwt2Rq/NmwBt38xryIVn6F7WJl2xNB6ZzE100+PWsw6/OnWgMq+rTgG+EW8K+w 36booUSNbuQvpCnY/LKtbYWU4/62RLE= X-Proofpoint-GUID: tq044Pqgty29OYlnCUfe_G2TlDMtf1cs X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-22_03,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 clxscore=1015 adultscore=0 suspectscore=0 impostorscore=0 lowpriorityscore=0 bulkscore=0 phishscore=0 priorityscore=1501 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609220293 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=lists1p.gnu.org; Received-SPF: pass client-ip=148.163.156.1; envelope-from=farman@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_H4=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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1790108294886158500 Content-Type: text/plain; charset="utf-8" An invalid length in an SCCB header correctly generates a specification exception for the regular (non-PV) codepath that processes an SCLP instruction intercept. The PV case doesn't, even though such a thing should already be sanitized. Since a short length will cause problems later down the line with the storage that will be allocated based on that size, put up a defensive check and return if it is too short. Cc: Janosch Frank Cc: qemu-stable@nongnu.org Fixes: c1db53a591 ("s390/sclp: read sccb from mem based on provided length") Reviewed-by: Matthew Rosato Acked-by: Christian Borntraeger Signed-off-by: Eric Farman --- hw/s390x/sclp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index d8b655efcc..ad8129a5d8 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -277,6 +277,11 @@ int sclp_service_call_protected(S390CPU *cpu, uint64_t= sccb, uint32_t code) =20 s390_cpu_pv_mem_read(env_archcpu(env), 0, &header, sizeof(SCCBHeader)); =20 + /* Do nothing if the header appears malformed */ + if (be16_to_cpu(header.length) < sizeof(SCCBHeader)) { + goto out_no_write; + } + work_sccb =3D g_malloc0(be16_to_cpu(header.length)); s390_cpu_pv_mem_read(env_archcpu(env), 0, work_sccb, be16_to_cpu(header.length)); @@ -290,6 +295,7 @@ int sclp_service_call_protected(S390CPU *cpu, uint64_t = sccb, uint32_t code) out_write: s390_cpu_pv_mem_write(env_archcpu(env), 0, work_sccb, be16_to_cpu(header.length)); +out_no_write: sclp_c->service_interrupt(sclp, SCLP_PV_DUMMY_ADDR); return 0; } --=20 2.53.0