From nobody Sat Sep 26 20:00:19 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=1790016329; cv=none; d=zohomail.com; s=zohoarc; b=XCJ4M0DIlXcNwsM+WxNoDyC73drI6ccKh4XTE7mEc+KXu6xn/d1lxxwjUJPgPBiTjBejzMYdlWB5CD12GpbaZqU5H4wUYzIcouCU7SgplzUphT5PMzJnJ0mO6WyhfvntAcFjxZzcdTDJ2j/gnYijDzeM/YJ9Gr8RVvZFxfZvKtA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790016329; 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=Ok4JeSg1DVfl8WZKAMtPsQNzVp7xA1TuqkmVTL/9GEI0F2TX0FFHWg87S0w9/+Mo2AJtZ2Qw3kRC6UyDsehka8G+uWzJg4bUByXzIJBJOwHIbyo4loem6laADqZoVNnZk0g0OQWjhhUGVRl4J2tGtOvwu2ZoTPlLuE+U4dD0GME= 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 179001632952396.04054656788719; Mon, 21 Sep 2026 11:45:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x8izQ-0005RC-6a; Mon, 21 Sep 2026 14:43:44 -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 1x8iz5-0005Gk-90; Mon, 21 Sep 2026 14:43:24 -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 1x8iz2-0005zn-5I; Mon, 21 Sep 2026 14:43:22 -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 68LF8Zil1860816; Mon, 21 Sep 2026 18:43:14 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 4gskg2a738-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 21 Sep 2026 18:43:14 +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 68LFHeQU2399989; Mon, 21 Sep 2026 18:43:13 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4gt7dy6cnn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 21 Sep 2026 18:43:13 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68LIh9O237159324 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 21 Sep 2026 18:43:09 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A93A32004E; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8488B20043; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav04.fra02v.mail.ibm.com (Postfix) with SMTP; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4958) id 6851416038D; Mon, 21 Sep 2026 20:43:09 +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=mcvihVLLp6pwESyf61GY1b95un8ZjEomc dWdc+rrqWKuUAQFLTfSou9POPgFYvvtoW6SEZpk1bPvgG/cRj1yKNgm0Tb3Vy2/O 3grC03MHGBjMcZVqeIp//KDt4oSO7lqp29cCipUAf4GhOoK4tWDC/Ro03Pa2gkxD 5HfR3pQ+343KSJZ1y0zKsNO81re5i623bqEVNQMl9mpE6aNr3A6vDDyY8IwR05fh LTBim6Y5goX2oyeCn1GI9T6GRBq+gLnuiZ+cih3j7nmcG0IBEbwdEc5EST8WDvg/ +6p3qIQNDOm/vBbkZuuo/LxXLKoUHgZhJjbvs50vzJhzmuZSMEawg== 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 v2 1/9] virtio-ccw: Limit ISC to MAX_ISC Date: Mon, 21 Sep 2026 20:42:57 +0200 Message-ID: <20260921184305.3791311-2-farman@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260921184305.3791311-1-farman@linux.ibm.com> References: <20260921184305.3791311-1-farman@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 2xHIJ-AVdwwbBF_t-Cy9gXXlN3BfghUA X-Authority-Analysis: v=2.4 cv=I43w19gg c=1 sm=1 tr=0 ts=6ab17ac2 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==: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: AW1haW4tMjYwOTIxMDI3MiBTYWx0ZWRfX5KVNHNBf8B5A 9FG8pKC1y8/GO0SFO9mKA6bGgIaqSu/9z36/pOvf19NbLsvSpy5PuLxBVKwRbwCrMLfu6+sRUOz OCk66+n8n9/gmILMwQwzYkRZAXyc4QmBXZRRnztVsa7Cp1ZDEStGX83JsrjxkfmOZfRjY/Pi6AL /ZaGq7CAI/grc9jEGMvo1kBGIVBmED4SdNAu9MJ7eYAce4ilZ1tXz4ZP76mUtBa6ZiFKTTPNx6M ZdNnjl6BQPAIz6C49ZgDm1Syv2yBN3w75HUTgq5h1O25YqcsoEg5bV7wVP52sO2EN8LSENHlYbH CMloXAICc8xwSr2KENSDD5Qcr4vqGpclpG5HRbeCBCgvRxyONjznwQ5LNzzkne1aMRKAZ+19X5a T+nCrbEmQsw/6toTUGrZZeC8vn4Qhon2MzMmjW2VdHlDSyHvD/LNTOsFRDaF3TJ3hwS/a+xaC85 kl4nkAkQvXZOasOQJpQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIxMDI3MiBTYWx0ZWRfX5+3qDV3egYLV Asuz13DLo/iieoiKNBJJDMlnUdLId/EbxIkDa2nXg9D78FyXkp8fxXuBa0T9aumSEceMlPa+/lu 5Q/Y8Rt6GkiUSIh1QqBhtptR7Sodgs8= X-Proofpoint-GUID: 2xHIJ-AVdwwbBF_t-Cy9gXXlN3BfghUA 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-21_05,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-2609210272 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: 1790016329876158500 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 20:00:19 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=1790016293; cv=none; d=zohomail.com; s=zohoarc; b=TJ0lT31A35qXSD4qH8kglitjvxKsGIMLs8QqA4/IBcEIoGAxMRqqSjaeol3fBB/auYwkuK+akqyLXdjhy9RfpicrRT3uy82mCydMcamFGw//4jkTSzH/Fx0sqVGWxghy3ArbKjW/5ovdsm8Aex1ejLsLq6vsIKlVx1uac3JLIeM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790016293; 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=YIgt+wFGB90zMvBau/vkmDAdOiAVegqKmYg3wMbX3zM=; b=PDdIxFz7zZ6TyPy/6g1kbc/13TISMvsid7t3h4W8TDFiSyNUXvIn1ZyMw9sp3NVsdwlIbPtE8IWw5vGzbtksTl8E/NjYH8ywx10RaH0oHU1t8tBNQTSdoVm1iNSCcGZXoBZFfiN5Cw8/e1zF812+qmSmdQM7/qbTtjyXRH7YQzs= 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 179001629345073.52446157143231; Mon, 21 Sep 2026 11:44:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x8izR-0005RX-O1; Mon, 21 Sep 2026 14:43:45 -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 1x8iz4-0005Gh-UX; Mon, 21 Sep 2026 14:43:24 -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 1x8iz2-0005zo-6V; Mon, 21 Sep 2026 14:43:22 -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 68LF8KCw1869578; Mon, 21 Sep 2026 18:43:14 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 4gskgs2720-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 21 Sep 2026 18:43:14 +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 68LFHZXK1489517; Mon, 21 Sep 2026 18:43:13 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4gt4qq6s2b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 21 Sep 2026 18:43:13 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68LIh9tN54460686 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 21 Sep 2026 18:43:09 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A4FC22004B; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 83FD520043; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav02.fra02v.mail.ibm.com (Postfix) with SMTP; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4958) id 6A4A4161696; Mon, 21 Sep 2026 20:43:09 +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=YIgt+wFGB90zMvBau /vkmDAdOiAVegqKmYg3wMbX3zM=; b=ds/X5GCLdr5t/kehEBW3SZ2HkccGQN0j6 GLSSEgAJBjsv+kL4euYkAdo+9SbkfuU0DdJBx+e6AlYDg3aUwi0hecXjw2oN2ike 6PoFe1eTn2Nttn6A72LzVxMKZEAYCqAQBQmOSg0kFVkmYtzxPRZG57biTbEOz5ab Cl4/Y9ybqPtTevrW39YdKFeDUEuf8OPsgw+e7INqaMr3KxJqCF88B5CkdFKr2zXs hf+H/fgyS8ROkVYKPgIPTbpcs2iv8YTTfS37FAb8Y90mGYWwP2ysDZQY27Ymjiwc IHEzpm1cAzT0n2I3s/PCszuEznbMr/u1M64zP7e4LXRh/2AlvTG5w== 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 v2 2/9] virtio-ccw: Do not overwrite existing indicators Date: Mon, 21 Sep 2026 20:42:58 +0200 Message-ID: <20260921184305.3791311-3-farman@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260921184305.3791311-1-farman@linux.ibm.com> References: <20260921184305.3791311-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=6ab17ac2 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==: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: L8bmJPwV05lmYm7AEIdL8ZycHQtTEMHv X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIxMDI3MiBTYWx0ZWRfX7W2BYH0HSivU chOMGxGQAktyh6Ozi/dqdV8SqHyJWVWTHc5NPFgtjx3rQW4nMXNxpKdYrZUOFSubDH731GR3FnH ReiTBp/n/qjWfr4YYjYBRkyDP0deVAM1gSDG0f+MNfj6DlXWPHdZGR7m5g30hU1jj4whSlFYpXc r7pUBGDbu7tBbBLHT+rq79ci9pGcX2+LiZdAaBQUtO5LGecitaWXpvx01ENTED2/uGVm84FToCT xfRWil3CdlTiM92toSlLIAgTVLE/iCQ33rBruYFRG6sHKbZyGEwvgTVurDVheoz+e1O/oSXGhvo 2AIwwbq+O+YWzQwoblWQ/Fvr5Zs3oMrUKZkl51Nz3XzfnWfhoK3/eyW4htnXMn51FxZIRoMKidN i5uUwIdomoWWfHIUaPFzM32I3H0MxH2p5N8aldm34Bm91/DvhIhgwM/62HMRrbAWn/6aokiKQrK dGNrWn5MgaBxWNVYV8g== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIxMDI3MiBTYWx0ZWRfXy5k9GeRUrdxb +8LWLt4IY+jfOTm/IbMeR+WWi2ZW7VpMIIngSgWEzR4DJ3f3PXQuiyPqLz1O06KW6kOO7tN+QTl ZObMmOOeBr0lgzOjI9PRYGyrMqTAv8k= X-Proofpoint-GUID: L8bmJPwV05lmYm7AEIdL8ZycHQtTEMHv 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-21_05,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-2609210272 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: 1790016295680158500 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") Signed-off-by: Eric Farman Reviewed-by: Matthew Rosato --- 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 20:00:19 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=1790016298; cv=none; d=zohomail.com; s=zohoarc; b=oF5nHv/+j1xfGl+/n7q1Tl7pM08GiYNis3gToPYhHEL+SVomuYbV4ZLuIPsTIUC2jTCM9aI7le+/BfqrPcJNHnwJMmdDmQS7rRDesOK8yLoo8oCBUvAZ8XmmElABwyULPu2BBJmM5yGoMNbrKd1cDpRf6hoEvK/epyxAtO8668o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790016298; 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=XujLNtsXTG+jf0RRiZ9HXQnc6LecdS3YF6wTe2316y2C7331rUF6vv0qYSo4oxe0dA4ZLAYCd8ltSBJxkz/cErBSJYs9MlTvYH3/x1TLmHRnWlKGtKNOrOVQOCqMXgEmPaS0EKSXmExyzDZp9ieThPnTMHzTNiblkjWavRYzZuQ= 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 1790016298448845.371788141635; Mon, 21 Sep 2026 11:44:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x8izU-0005TX-W6; Mon, 21 Sep 2026 14:43:49 -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 1x8iz4-0005Gg-Tg; Mon, 21 Sep 2026 14:43:23 -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 1x8iz2-000604-6x; Mon, 21 Sep 2026 14:43:22 -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 68LF8Cgj1860549; Mon, 21 Sep 2026 18:43:15 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4gskg2a739-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 21 Sep 2026 18:43:14 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.11/8.18.1.11) with ESMTP id 68LFHZpq1451448; Mon, 21 Sep 2026 18:43:13 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4gt67gpjfy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 21 Sep 2026 18:43:13 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68LIh9vO50266540 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 21 Sep 2026 18:43:09 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9F93E2004D; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 827C020049; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav06.fra02v.mail.ibm.com (Postfix) with SMTP; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4958) id 6C617161DBB; Mon, 21 Sep 2026 20:43:09 +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=UbjBzbQTPg9NxY8pF2+cq3oR7HjPifGbO yOxWRf7oG4Y/HvSSXF/6SSH8IVMYPmzEPrDuyFtV76GrHucu/urkhzjF3mLhVr+w sBu7MaRHhFb03qtQNdJbfUEUuo/G0ohuvE+MfSr1PXiPIotCAVSBi+ElQg92rTbF umhAYCzlg/QBWg91WHNBif10OEdJ/+nm29toomVSHkB8//+x+xnYtwc8Z9i6X+ib /Vd4CpNhvEpzk5FjW2UIwrEnUOuSEDs2ZlBFwr5OwS064EtWg5NvXZv2636VBtmw h4RupIc+pfcEVB9a42kX1wWtmVQkGtilOUZZqzGx/eI5jPT807vlA== 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 v2 3/9] virtio-ccw: Fix rc check in read configuration path Date: Mon, 21 Sep 2026 20:42:59 +0200 Message-ID: <20260921184305.3791311-4-farman@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260921184305.3791311-1-farman@linux.ibm.com> References: <20260921184305.3791311-1-farman@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: NQEpCc6QAlEiBi3FCiOKEYNg4aI8m5O- X-Authority-Analysis: v=2.4 cv=I43w19gg c=1 sm=1 tr=0 ts=6ab17ac2 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=69wJf7TsAAAA:8 a=VnNF1IyMAAAA:8 a=uiMiztMkydEs4ieJCJEA:9 a=Fg1AiH1G6rFz08G2ETeA:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIxMDI3MiBTYWx0ZWRfX5dtVnunbPT7I 3bGzTy3E1ikFhFoHH/3r12up+jBTBxHPZxwlw6q/FXjoTq1/d34ZIy3Llm93ngWWgibqogN1oP7 NF51UQlFIuYNO4lytiHY2ItEXZwbHtFeO/DLenYNJXjKTyYac0EHiwvCsAbc8zmJjrQFvspv4DU tYplcSQM6Vcl0YahnhLZjf4S7XATBuZJ8bMkwxn3drKiQaXvVOxpkAR/zdXWtPCO8Yfmjx09qFR lGFcD3DNNNf7EGWPk5SfRTcTy00P+R85QuRarJj/VyU85jptZICN18qcxY7QKvT4Eogc3sF0oMw P6Hutf0sCvL3AvSxNI4lbHZ3BGejUhkjcCtGqan1to01anW5k9CDErdP+r5Dhekobeb/7gmoFIp 75UHQftB6eF+edikYmLm1X2llEfX2Cb30xh+DZ74wHPvt2NDEDKujuS7FK34OnckMBHYMoPqYMK HXHyJka9ItaozW63Q6Q== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIxMDI3MiBTYWx0ZWRfX0wZ0420Ddcxh 0dH6IJMJT2ztACKjw4cS4tOREklEG03uuJwP7mjoKEn3AlEc9XkLvoUVpL2iQ/LGpqyTIvmRqhQ suPSwGPdHzRZRRgfjjZ7zfeNrOo4mfs= X-Proofpoint-GUID: NQEpCc6QAlEiBi3FCiOKEYNg4aI8m5O- 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-21_05,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-2609210272 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: 1790016299722158500 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 20:00:19 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=1790016354; cv=none; d=zohomail.com; s=zohoarc; b=KyqIhztWk5kKs8iirt/0nVcyIad4Yud3o2ZdqiEl6NC4hbGy4qcvE3xemun7tKScjLxIMiotlGZOBYu6GcTYeC+UZp6Ck2sAVLOVZvkoUJ4s9XW0mnXPQP1Cwy+vhZucG577/Fxa7xGYcXTLKpzyJn2bAkBv1SrwV3k699drI08= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790016354; 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=OocjGUkuDViC7P94V1fnLpy6URJ8VgWzM4WHXzlbU6wJobmEMvy9hHfHUqKMJC0laQm2QdUbrcDSApaeBjvHwqy2v2PR8CorLp+TZcph7DZvX00Yl0gxbW/Ccko3JUzNLKdOvcHTWA2+I7JjzdmEx5F/wvhNMEl6qFKdYw824is= 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 1790016354141512.2896252518968; Mon, 21 Sep 2026 11:45:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x8izM-0005NQ-8R; Mon, 21 Sep 2026 14:43:40 -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 1x8iz7-0005HZ-5z; Mon, 21 Sep 2026 14:43:25 -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 1x8iz2-0005zp-9s; Mon, 21 Sep 2026 14:43:23 -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 68LF8B3v1869514; Mon, 21 Sep 2026 18:43:14 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 4gskgs2721-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 21 Sep 2026 18:43:14 +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 68LFHkhH167243; Mon, 21 Sep 2026 18:43:13 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4gu5bk96a9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 21 Sep 2026 18:43:13 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68LIh9P646727552 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 21 Sep 2026 18:43:09 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B33922004F; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 89B2D2004B; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav04.fra02v.mail.ibm.com (Postfix) with SMTP; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4958) id 6E8A5161DE2; Mon, 21 Sep 2026 20:43:09 +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=SiaPMxcfZMlPgl2oO5PTiMkb0vLmTC4YP mTWx3TM3dKeQQ5VWrOLWKrCyUC9pTjDYGjI66f5iJMiuYf0mcwa4qRnPchNJNu5R vQO1viXY6xEfpZ/FhsXDi9Fc5Ok8CoQjmUJj+fSU5dVZ21Pe18qsGAZaOIMJQczZ hmzGt0aGYzpsk1RVLJmoHNxis5QOi29FM4mV+oTsp/cWzbZ7y7KM0vkvtzDWKydY B58iIYZl1rvs4FrifY4HL9Q7ONEnGnwchJEjzcDHnQJc9P2H3wT1j/UGiPXKCNH0 DT93XrKWcXbrvneX3jYznVOVTBFK+A7Z6HeYipocX7ca+3o6oVRQA== 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 v2 4/9] vfio/ap: Clear error object pointer after non-fatal errors Date: Mon, 21 Sep 2026 20:43:00 +0200 Message-ID: <20260921184305.3791311-5-farman@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260921184305.3791311-1-farman@linux.ibm.com> References: <20260921184305.3791311-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=6ab17ac2 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=69wJf7TsAAAA:8 a=rlruftgHjx7kiOjKd_sA:9 a=Fg1AiH1G6rFz08G2ETeA:22 X-Proofpoint-ORIG-GUID: oGK8ntajq5wZYkur7l_mvT5EqDEQyhUM X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIxMDI3MiBTYWx0ZWRfX1l/wA93PhuZi RglJNBdPhRxJJNrbVed2PL7ONMCA7ok1HOzZZBtOibGenqWxJqSog+j1YpCZoezEaKte2i7+nIl /3vEC+adi7v6Oau4xdjqQt996qPkOKj604S3BXB9p/TqC2fhOGWrTohQr8VuA3viY1YE2VwXysM WvPLdizKk1X/eGN1Voi3iUGA6fPwKNR2HaAv0NOWZgDcYMv0venZ6zGEXvcflZM0p4EO6yjbU/7 3dHOKnOO3AQpw+oAtLEWq4QDCnMhlatVOxeC/2QLpAk0ruQyQW3kOjBghCTgMn8WLNZ5NCI/bi0 5YRbTIT0MPBKx5ciUg+g8aUnpBlg19k3Kx0TjXXPHpdBZdTHLDA0f5DVXREQvWgCXqg7aGoQcNf dE1D2qcHnWLgfS63ri3bCtAoTcW5YMjDScCWG3aMDIxdD47dX/IOt9e/DIR+AWX+uiLsZo7/m1Z DWqzQMdLuU+gI3cAYPQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIxMDI3MiBTYWx0ZWRfX3QG/gCsSl33k 27947Puo/PXrr2PcwJ2OK8PfA0aMU2qFgv696dCIdmiYkHWAdRor6CMHiaJv9YDknAok7GVjhUZ C2uJcmRaOdqGCJwmdBjEVmFzhoeWNFQ= X-Proofpoint-GUID: oGK8ntajq5wZYkur7l_mvT5EqDEQyhUM 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-21_05,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-2609210272 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: 1790016356070158500 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 20:00:19 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=1790016366; cv=none; d=zohomail.com; s=zohoarc; b=Qf2OElgu0c3rNP7DlZkAesf2sU6FVi0y0yOKWrZkZcut4wr05kOdH1HBwG572TicGztj/FR4mkCaeUCLEpc0s3xkqTaWmbqD1S/RN3Iqy9ZN4e1XFcmQziNXo1Wy7tjSBTkG5ANRFZHIW2oJEpb5TxEw5bgPK5yxmAnqoNIdahw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790016366; 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=cPjHuHEaqNIGo739JgDnCKtYEwz+EXWaCXCTYbDpuI1tWjk7xLE7kzzfqllPKsPL5AuzxhzPu9aoDK4I/Eyq3xejbOKXC9iPmp5u5A1Jw/UMUNPcEEYoszqhXUwjQsrY+xbeFPlbVbMLNVAnxVgsUKyTqTr79NI4lm8AIlX+tL4= 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 1790016366439502.52892950571277; Mon, 21 Sep 2026 11:46:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x8izL-0005Mt-9o; Mon, 21 Sep 2026 14:43:39 -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 1x8iz4-0005Gf-Kx; Mon, 21 Sep 2026 14:43:23 -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 1x8iz2-0005zv-0D; Mon, 21 Sep 2026 14:43:22 -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 68LF8Er24193462; Mon, 21 Sep 2026 18:43:14 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4gske1j78v-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 21 Sep 2026 18:43:14 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.11/8.18.1.11) with ESMTP id 68LFHZe31451443; Mon, 21 Sep 2026 18:43:13 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4gt67gpjg0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 21 Sep 2026 18:43:13 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68LIh9Oi45351312 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 21 Sep 2026 18:43:09 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CCB252004E; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id ADB952004B; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with SMTP; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4958) id 70774162260; Mon, 21 Sep 2026 20:43:09 +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=BmxgpMAa6EkBPy/6JCD5o7FC5HiNqbg+J TWeiBdvohYElKMPH/40sxWQCZii9KmhDXXKRYgsuU/nUqJ4bA8lCDJmGrgUOLSko D4k3E/tzx/CZCmseeatUZhhEyWsxpi392JcG5hTVjWRMUbc7oW0if1khaFHDjF2W LngbB9i/79w3Bns3Bm95sZYbiQbuLE+W2vy1Q/XyrvTcv9EartE4TJ3uyw5iA2Pq Vc78r1u11Kq5VshynXZOSZnWpaui3i3D8hCOfn0T03GSTTK4qIWsvBo30jCXi1gh GTWakZQp/4z50Z37I9pEXQqcsl8yLGZaxwzQN/l4Zqe4DkqxNXv4w== From: Eric Farman To: Christian Borntraeger , Matthew Rosato Cc: Cornelia Huck , qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Eric Farman Subject: [PATCH v2 5/9] vfio/ccw: Clear error object pointer after non-fatal errors Date: Mon, 21 Sep 2026 20:43:01 +0200 Message-ID: <20260921184305.3791311-6-farman@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260921184305.3791311-1-farman@linux.ibm.com> References: <20260921184305.3791311-1-farman@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: GdMdESW48vDzgt2Xj7eoXAUKzolVs_Zn X-Authority-Analysis: v=2.4 cv=EOCTQFZC c=1 sm=1 tr=0 ts=6ab17ac2 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=WuYEg3pJWr1ZmXxL5igA:9 a=ZXulRonScM0A:10 a=zZCYzV9kfG8A:10 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIxMDI3MiBTYWx0ZWRfX20DCUwp/OjUm aqXwy5d+bi3DVODQzN3GaSQApKjxn4gna+VldUkeQSAeFztFEogZq6IE5P7CjplHg9Ev1RWttjN 64494B0Gj+VR2e3wqXvusrH2sZfvPXY= X-Proofpoint-GUID: GdMdESW48vDzgt2Xj7eoXAUKzolVs_Zn X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIxMDI3MiBTYWx0ZWRfX7U3t5eDRFd0E IwPJyU0irHUnjU5Mwu7s5WxegenAT6NofX8nQRslNr7uN+TXXqdD3YEnCjZvTxIfeOvPyL5DZ8f Nx0DW8pOMAjWwart4nxkspaxpr0xv9zQ9Ap1/Cfc90NXa/A1XGeKdTNqYMod77Y/pbOdEjG5ZID n3/jKoK1Zrv3TirTLixpD5i7T8QXOVNvop/rvl5aHVPvIE6CkeNV4EGqFV5KFsYpub9Bp07PDXb oeVRh+0s9hIZlId/nvlQHWTvpkJ61G2YyDAzA4yq4b1e2+wQg/Yhm3caw4yYz/YtBJBRMOnoFnN ZXcWssmy/FZhUWfrSC5N0Avml7FJV9ko2gkMqiXsgH0Tnxvwm7sqgbj96lCsnE0ZCs+C8noFm66 eA5cZAmoeho396pNNYnID3yTbDg8uY4KNz5ivCcvA2kV6IEtehkfs1rR7KS03aXT7oOKN9eol2j tljb+Sf5Cm5bmlcFPtA== 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-21_05,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-2609210272 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: 1790016368086158500 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 20:00:19 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=1790016310; cv=none; d=zohomail.com; s=zohoarc; b=Sk4u4IjqLIlaG2zVK0yEU7rklf80j0rZrmnlSxLWpxkeBRAQWhByCaW96bZy51O1acfnwjDH7WhfTTkOnQbDa/kI55k+I6RKMD4aa6jq17LgAVD8AzMZ/Sdj4UJJQeauXOdMTVRS3MAHTZRT66tcAupqwh7oRJiIla2n70V+S0s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790016310; 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=33dBcRKi+nNEAHJlAfyo41vvgUGVDBeruD/O56vvJAo=; b=a8f3TfXl4/K6ZsjaB+ozr6W1bgWrSwQeOpMeHjYAJ2GGrQD6V9inqI7B5Wq1MGyNNIxEfADp3fLdtdX0zwxaULr/yXnCczsqKkymdd0MZCoFLejS7ZpcRD8Nzlct/C23awj8PMNO7a1oF6nuMis4zYacOTMN25FTuDRdDYXfe+c= 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 1790016310886984.9772006655905; Mon, 21 Sep 2026 11:45:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x8izM-0005OD-Gt; Mon, 21 Sep 2026 14:43:40 -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 1x8iz3-0005Gc-HX; Mon, 21 Sep 2026 14:43:23 -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 1x8iz1-000609-VZ; Mon, 21 Sep 2026 14:43:21 -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 68LF8NeL4193604; Mon, 21 Sep 2026 18:43:15 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 4gske1j78x-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 21 Sep 2026 18:43:14 +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 68LFHX3w1408451; Mon, 21 Sep 2026 18:43:14 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4gt5qjpku8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 21 Sep 2026 18:43:13 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68LIh98t46727554 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 21 Sep 2026 18:43:10 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CCDD220043; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id ADE622004E; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav02.fra02v.mail.ibm.com (Postfix) with SMTP; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4958) id 72694162303; Mon, 21 Sep 2026 20:43:09 +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=33dBcRKi+nNEAHJlA fyo41vvgUGVDBeruD/O56vvJAo=; b=aJLHubZyJwHhxvjOXgezeCJkHW4go6vh+ uRnRziltqLoGYT3e65yM7VlQZFV25Mtron9ugR3yGc3Trdav0APoiA8it/bQmBgo 8+j9klZTdjPbJfWHc0RVujW6axiWjitWm3uhV8R9T+CLGq8w2/FmFX/WSM7zDg1o pYLdLS0lZkBcuQBXWNIbWodeAKvWswF0R5jBGiwAWLdgMgVNSAlzmGLKfOWlDK3E Mew8HWkQapTMi10WlrpNRWHY0JixcLJ8SMaxZXObsk9qpHwZtabolKxYG9YqSIaq 2CRRJwLavcfo2fHYDGtGiemS+uHL5LKcu0zsCCUwHLVIabosFKgYQ== From: Eric Farman To: Christian Borntraeger , Matthew Rosato Cc: Cornelia Huck , qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Eric Farman Subject: [PATCH v2 6/9] hw/intc/s390x: Fix payload to KVM_HAS_DEVICE_ATTR ioctl Date: Mon, 21 Sep 2026 20:43:02 +0200 Message-ID: <20260921184305.3791311-7-farman@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260921184305.3791311-1-farman@linux.ibm.com> References: <20260921184305.3791311-1-farman@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: MVPSFVXXYuQ5_3k1pURhMB5e6xUC-i_1 X-Authority-Analysis: v=2.4 cv=EOCTQFZC c=1 sm=1 tr=0 ts=6ab17ac2 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=VnNF1IyMAAAA:8 a=cb2EWknS8209ijoe3xIA:9 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIxMDI3MiBTYWx0ZWRfX12ojIe6BnFlc 0UtXQgcwO7LErA7mz+aSBzwi9veT2ZCNRtFpbDiQSTMpOrjydYTdI7MT69IB739DWTtHtkkMPnk dbG+ldehIUdv6WsB77aLf057MxeJASk= X-Proofpoint-GUID: MVPSFVXXYuQ5_3k1pURhMB5e6xUC-i_1 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIxMDI3MiBTYWx0ZWRfXwqsFvnChQ22A dc9YQFbhbe0WhbMBrLlKFj2LrF9NRDqFKBRqDUM1+aA0/D6DRuzyPaL0A6QDW1wy8wAo2SuK0gI Gs30E+gtRC/5qSqopntt6idqXewTk7cGdi/8r1dmIZtffcCLzn25C/kS2QlhJZsAFdDCgBV+3YH sJjlEz2boPHjaLsm40C+3M5Yf69sGK8uxS3TW4cpK+O5q+rGzrH8CoIjKoY/3lVv6ZWcgM01Rwm fsT5FGjuAGDMgkM99V25QWnWOWiuZzWSRy0X//qpHk1pWEbEQc/tDl8+jTI8KsTE4BcFpnm3qou WKyR4PvuVoL5kIomDHccrjZS7A6118VchEqE2E+JRQv5rLhSqQlVQXOJJliVJhCcVt4JB9exTbv NxnYL1pCh7YtgJPP1ZNyeUDiC8u9PL5PEy9Xd13RIPhBw/e5DsMgbRs50dBMYDUyMuH5XYJBKF2 SNmfbqqBzaduWaF9mbQ== 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-21_05,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-2609210272 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: 1790016312208158500 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 Signed-off-by: Eric Farman Reviewed-by: Christian Borntraeger --- 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 20:00:19 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=1790016362; cv=none; d=zohomail.com; s=zohoarc; b=EUv6sv31qFTas+aJ0z5sHDOuELav/RbzAUXhSgGc3u8i0BjKOCDcYmUkKVQKMAEFVKWZ7f4f2JxM21chQjffoA6hdALfCXbLt5M247NZpG3+WjQ06ltfDIaKVOIlH5+Wb000AdqApaq/sh3hhOlUsKzsxekliAqF2k5zt0/XC0Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790016362; 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=myPHJlndDveNHp5qeiGr3JnoVZa/YmVzGHgnnObBFos=; b=bszf0wynnLVW7E0cPoKtsfWdl4Ycifk8zC3uMk3+NZonypa1bwLwliPdjzs0u4kOraQso96vuYQ8TtySFVu7Kbh3E5U5r6/PZa3FOzMVKzQZB0COcUpJ//T9j6RjbdVNEq8R+lKIZJjDBMIotOfPmXYrNzsD1rdBV++nnyQ78eI= 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 179001636235570.30317440368208; Mon, 21 Sep 2026 11:46:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x8izL-0005ND-HX; Mon, 21 Sep 2026 14:43:39 -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 1x8iz5-0005Gj-8s; Mon, 21 Sep 2026 14:43:24 -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 1x8iz2-0005zk-4S; Mon, 21 Sep 2026 14:43:22 -0400 Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68LF8iii1903397; Mon, 21 Sep 2026 18:43:14 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 4gskdv21ss-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 21 Sep 2026 18:43:14 +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 68LFHkav167221; Mon, 21 Sep 2026 18:43:13 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4gu5bk96ac-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 21 Sep 2026 18:43:13 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68LIh9do44892644 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 21 Sep 2026 18:43:10 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CFFCA2004F; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AE2322004D; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with SMTP; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4958) id 74619162365; Mon, 21 Sep 2026 20:43:09 +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=myPHJlndDveNHp5qe iGr3JnoVZa/YmVzGHgnnObBFos=; b=Pa5hN7t8AHf6AYkU3cvuurUDGS0e13dwc Y4A6sWrnvT4B0MHevEBy34POTZhpMvCvSPWiShDIIbMrzOW9A0vWw8bMsay85Dq6 j7YLJi279q5U8KL+ySKDWEzOhGjx/+7gT1XtTQ1Z/Hb4keHp5wUIUWd6aYlNB5KM Wy1RdsaLLZg5tBujv8YvqaAmvnyjqumfgtAQmnaWdc5NrKQE97TCXDn5XAbXvtmC QYoEFZn5o2seCxmE0Ii1n+qHBOsVs9cMp23S3NEF5W3yrYRCDgb+BTNi45ApsP1E nrQNdDcBr76sRfyKdTO5pHK+KLPf0XwhK5vWnA5rey4ycumQppsaA== 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 v2 7/9] hw/intc/s390x: Fix check after g_try_realloc Date: Mon, 21 Sep 2026 20:43:03 +0200 Message-ID: <20260921184305.3791311-8-farman@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260921184305.3791311-1-farman@linux.ibm.com> References: <20260921184305.3791311-1-farman@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: e8glU5yBvrWkuFRrNeb8jXzNDHhgITyF X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIxMDI3MiBTYWx0ZWRfX831kSQZRe7TR Q+8k5O7+ffJ85v0Gt2RMlqgkJpsV6/BVNob4bp2pNm+lS6Zj72/HhYTawW9uMr5QBToIrIHqaaE Tho4iq6h8MYsnpaSERGKY8QPwkeoE7M= X-Authority-Analysis: v=2.4 cv=FLiOVOos c=1 sm=1 tr=0 ts=6ab17ac2 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=RzCfie-kr_QcCd8fBx8p:22 a=69wJf7TsAAAA:8 a=VnNF1IyMAAAA:8 a=M8FnGKaJMcETolB0Q_gA:9 a=Fg1AiH1G6rFz08G2ETeA:22 X-Proofpoint-GUID: e8glU5yBvrWkuFRrNeb8jXzNDHhgITyF X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIxMDI3MiBTYWx0ZWRfXzksffGJCN9ty Sxw+RQbSyYSZ7bXhuCTKNHvuU6j9fzcuslq5o7th8arZfxp2nmHpA+KuWOOS0eiBSGNMaYMBr0Z 8K1vvEVodOIDc+nLkIrZnw/wQ219aUI4Gl3cD998Ru5Wxr0+gEvm+lmURd+k2zJ2SZ/NRZKx3Be DjLiEtcoKKFUBcX7Stmkqm697bdP1LztY+Q0tc8lYatWZ/FII9PzhDv3g1TH4x44Dj4vdQoUTK5 smwd8VZlN8BoIsbtOOdLIRrMaQfQMWVxIq375MgGQyy5peNZkvP/RePsfQgV5yqgQgETL1NbcR8 qd5yHQCDBl4YwlkI1sBplM1VNK9uVekYon8nGYJwX5rsL8NKIwwYwO4OdtU2mNcgzy7kMhH270N Hqss/SMopgfRr9AyIVmA7eIPoiP+uFCejuIG9TeslIcVFk4IbRS52lBoXBVXhs9Yv1Jpv36RJyC J0gJk4H76GbtEy8Fz2A== 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-21_05,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 impostorscore=0 phishscore=0 spamscore=0 clxscore=1015 suspectscore=0 bulkscore=0 lowpriorityscore=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-2609210272 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: 1790016364106158500 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") Signed-off-by: Eric Farman Reviewed-by: Christian Borntraeger Reviewed-by: Matthew Rosato --- 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..ebee6bca9c 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 *realloc =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) { + realloc =3D g_try_realloc(*buf, len); + if (!realloc) { return -ENOMEM; } + *buf =3D realloc; } while (r =3D=3D -ENOMEM && len <=3D KVM_S390_FLIC_MAX_BUFFER); =20 return r; --=20 2.53.0 From nobody Sat Sep 26 20:00:19 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=1790016353; cv=none; d=zohomail.com; s=zohoarc; b=ifSVFU5rS7ZW6DetitkxQnj9Bo5tFqL5nxyB6fFqj+iVxNQZipggLtsDYy6gcDgqciyG1RLtJMfsJy7fars7QP6b4P5G5ZZYDHtaXV7QWaSTYF6j+5qVtT4UzohOH2FL+wCJkJ1AAcSn8U49DpBsgfMnkjAV+PF3blQm7peumXQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790016353; 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=gkFHQs6f6BI16EPtgVpUEdzh3zzbxQU7m60Xqv88VL8=; b=aLLTF1xvt2Yepb5in++LZzItELgm/CHTSmXe9rHF6ZZI4+ZXKSx0D0yTpgDJrZh2lLBdDjTNjjN8MKn9g+VYuWwuDzCyit3O4Sr8kopZBvD7dL3efrsmDIH/UprYQYrarpgXl3MqXj2eITBywpCgXLfQlOcc2svW77Mr80LIt8E= 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 1790016353518944.9617766530582; Mon, 21 Sep 2026 11:45:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x8izP-0005RA-LV; Mon, 21 Sep 2026 14:43:43 -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 1x8iz7-0005HY-62; Mon, 21 Sep 2026 14:43:25 -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 1x8iz2-0005zg-AY; Mon, 21 Sep 2026 14:43:23 -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 68LF8ZMo703687; Mon, 21 Sep 2026 18:43:14 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 4gskgq9ypp-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 21 Sep 2026 18:43:14 +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 68LFHk5B167161; Mon, 21 Sep 2026 18:43:13 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4gu5bk96ab-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 21 Sep 2026 18:43:13 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68LIh9Xl50266542 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 21 Sep 2026 18:43:09 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CAE1920049; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AD9562004E; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav06.fra02v.mail.ibm.com (Postfix) with SMTP; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4958) id 7654D162436; Mon, 21 Sep 2026 20:43:09 +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=gkFHQs6f6BI16EPtg VpUEdzh3zzbxQU7m60Xqv88VL8=; b=GdvamwXKpjmL/hlXMbfFgc7MTbce3HMtN 5xipvABdrdDVgcNJsGhpk3vGPROMpyU1dlybELA66+P4Zif8fQ6iSIYAVtSFU1Pf BjbRObkgVuMWQkXg9vctjqDBDcG7KOcpy0I/pjaDOQ92QuOSotV+2VN4uuwQcmvm zuBGJiz+U90Bs2PnQu/wHvQnTmXm54yM6dLTTf9qVDcrrIbyMCmbocVFTHausOc1 Iw/4J72E6ymy9vPGKjYSuNH20BglodPhXdPkM8PgEBzjkP7H/OLxnwjoZTu1FCcM WaMz5NqupgxsmmebOcp6T8mqt2A5VlUF2BeebeYTCeyS2xmstV/Og== 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 v2 8/9] s390x/css: Use datastream pointer for checking no-data CCWs Date: Mon, 21 Sep 2026 20:43:04 +0200 Message-ID: <20260921184305.3791311-9-farman@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260921184305.3791311-1-farman@linux.ibm.com> References: <20260921184305.3791311-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=6ab17ac2 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=69wJf7TsAAAA:8 a=VnNF1IyMAAAA:8 a=8cHL7K5PRkdKNGgrHUUA:9 a=Fg1AiH1G6rFz08G2ETeA:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIxMDI3MiBTYWx0ZWRfX3U4Pb86MSScx Kis3zWn4fS8dsB3aCEw7APz9opFDvQlERujm73AT87UWO3FAL+FWXO4KCU1LNE0VIlHQA1FZooS VSiN2J3gYl/p7EpUAaveLr21cnMZekZVCRjL5JNrjhfPcxy/n5MCfODfd/atXOcJxi+hvDAeOFc 6t3vo+R50vMFilA8+GSb0WqzU2ylWiKbReojQOwi5jHuaGmZe/wADupgXoQeN0G15WJ/Or8ThHG q+nllOO2wfaofkv5+PlmdxiZoAm8mDPsxZf4xzptzq7C22MG2+gC3hWW8AgVcYm04dISnq1JqO2 0N/TqfOuTm1JNyQ2TsmZPWFavztcRjYBGSc6qpqXbULqn4QpuTtEHo03OFupSvC6ZcBqB3J8EfY 9+j6BCvFy1LjAMAy7Lh1QGCZ3WzxWu56i9To1kvXXGjbEq6u5p1ENH+xfLs9oHUyeLcJ1gwB2Ac 6sPgicPOpcNxbxPwLkQ== X-Proofpoint-ORIG-GUID: YSAGFj11t21mmM_6Gas0B3CncbAgqeL_ X-Proofpoint-GUID: YSAGFj11t21mmM_6Gas0B3CncbAgqeL_ X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIxMDI3MiBTYWx0ZWRfX7n0vcXgQwidD o5vyVuHVWbAmZHwbowpvEI6IBeX9PLrYb5a7/6eWwE0NkFKB31J2P7bhg/ZFPO1/PDjN8qcFoq0 Hbl+sj3PhjB8KA189oMlOjdjMFGOOc4= 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-21_05,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-2609210272 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: 1790016354037158500 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 --- hw/s390x/css.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/hw/s390x/css.c b/hw/s390x/css.c index 9da9128d88..10bebdcb1a 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) { @@ -1110,6 +1103,19 @@ static int css_interpret_ccw(SubchDev *sch, hwaddr c= cw_addr, } } =20 + /* + * 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++; + } + } + return ret; } =20 --=20 2.53.0 From nobody Sat Sep 26 20:00:19 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=1790016354; cv=none; d=zohomail.com; s=zohoarc; b=cw3odLTaHjTtHNVa/y6mGwKImHRAcdQC+KuLCiB2vUmWLUAl+gOKvLBq+3kltzSDhoVDvA4WbDfmNn6ImvX2zvY5P8m9U9SME6NtFWIFgLUGkrW0Jbx03KukkxT8ZB3+8ClT5MayPBdIMpCgAMWyZScSYjC1FEyophg1/NoGi7E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1790016354; 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=Fs41DmktYCbLtjUgLarTA2+GL6qGcARcFRkzRgBdpCiw+vL+zTfoJTlNCPuD5VJW8CNyMdWuIarGcaXJt7MnhYbpMFjSR/gxXcXVGbJdaIylfd/h/v18On9VkRou9JVHdihBjXfI2Qxdw71S12VU+ZVhM0pVp8d8NdUGfuUUAcs= 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 1790016354708320.7478846788407; Mon, 21 Sep 2026 11:45:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x8izM-0005NX-AP; Mon, 21 Sep 2026 14:43:40 -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 1x8iz7-0005HX-6L; Mon, 21 Sep 2026 14:43:25 -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 1x8iz2-0005zm-7J; Mon, 21 Sep 2026 14:43:23 -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 68LF89Wx4193292; Mon, 21 Sep 2026 18:43:14 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 4gske1j78u-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 21 Sep 2026 18:43:14 +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 68LFHf0g2400058; Mon, 21 Sep 2026 18:43:13 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4gt7dy6cnp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 21 Sep 2026 18:43:13 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68LIh90K35717548 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 21 Sep 2026 18:43:10 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DC37A2004B; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B59282005A; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav04.fra02v.mail.ibm.com (Postfix) with SMTP; Mon, 21 Sep 2026 18:43:09 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4958) id 786641624DF; Mon, 21 Sep 2026 20:43:09 +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=O/0IB5Rt2d19kpakyfm4AfSss3gObiZuX hC8MmqtjVavPoJuh3JZB6brg+kih0vvkMywnzzJ3sHt/biQb8BNYb10DT1xuiXT2 RFgiwe22ro8Gv3YGgU6z8jPhoWQ4+ysc1Hg0O8gDAjqUKeQwVlQJlNg9m6z13OSu 2XayslQ3Yw8exXVSUbLL+BLWqqcJPoL1hBuB1JmL7h3j8CRLVpxYnoUsIMALVC2j lD+UI66zBrNcxQq6ULv64WQBw35IcrXfRjDR4p+JsnrWQGor3BwQcHVuCvdNi4+G BGmdFhZg8YXTaZ9h4L09NmXx9GeJoTnCTzgJW/QPYepF+mx3Pb+TA== 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 v2 9/9] s390x/sclp: Reject short headers in PV case Date: Mon, 21 Sep 2026 20:43:05 +0200 Message-ID: <20260921184305.3791311-10-farman@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260921184305.3791311-1-farman@linux.ibm.com> References: <20260921184305.3791311-1-farman@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: ttWEbJkaDqaXvVGQDPtSVB1uHL1n6nE9 X-Authority-Analysis: v=2.4 cv=EOCTQFZC c=1 sm=1 tr=0 ts=6ab17ac2 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=69wJf7TsAAAA:8 a=pH6oLB8u_88KfPtTI8IA:9 a=Fg1AiH1G6rFz08G2ETeA:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTIxMDI3MiBTYWx0ZWRfX+CFTVMOAugtF lb2vbbePPfBKQLpJ2nWdc7RysKQ2RWYxXFk82XfTld3zVsNhs6LsErW4dfvRNHJRwFx7GHkXwnb gcPyrfax6P2jWqHLopQkj9qgAn4FFik= X-Proofpoint-GUID: ttWEbJkaDqaXvVGQDPtSVB1uHL1n6nE9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTIxMDI3MiBTYWx0ZWRfX+OYaILPyoVJu AE9Oy2r8KHRMiMlJckPoevlY4rCubavryQlWQ8BSY4mrYvFzWh4YLGBSVDpVvpShCBL4rB++XRR RmkmKJrSsZ2Esfc2kN84cMoQ124nspp/iNn0Dp2gxjF4QmvheSnvAwpcDd3Sy4CLMPWBQJC9+nW u3JS1RYff6/dVVRpMYCX5KlHqkZI74jHh7oz62Bw7BXP1mEfUWx7gldwhGQBk1cAGiOUjdiVO4y 0VxDfHCh/h3a3a/tOBctNISDXNQ/g/qzJ+Y6qci8Zzjn0504l7gw9hOxhgktzmuKX2jySDWTRxY DrcaKIvpd75GPZRqecS4LejWKxmx5voh/xNlJljULjNYm02Re+7lzuEhMQuRGNpR6afLo/W3PaF oOSi3DCsc9ls0qA5lV40xPdx1mhInLF2jCs2jH/sxeWQaJ1OF5qG9OB19ei9/Bxt0a2NQCNRuLv NCQG+AlQ2DuxL6nOJ8Q== 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-21_05,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-2609210272 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: 1790016356056158500 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