From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D980429CEF; Tue, 14 Jul 2026 23:22:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784071339; cv=none; b=PayPCtwU8xDJomit5Bf4J0uxpFIOtF1ZL0z0JmzC6SUlQzUW0YSSFGMg3hSYL874ZcCyCJkquEE+N1alq+FFb6L1y035i79HG6rl+cEfBMp7Qot0KVHFHBZZr2MrXvpHeWaMBzJ50F6y6e2oRKw+JdEZfDXC2Un4D5IP0JmfKO0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784071339; c=relaxed/simple; bh=hfcmFiET0c7i390IMGXjeWY367lf2ahcVbfMkMo5sJs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IZ8kjFdrfAK6L5iFy09jJUlrqrXxehsNqKwtFwPq2k8Voektq/OF0SsX7QgpLzmhhdH7m7JBHEYPUNiGGEMI0KpfpEYVdYMF7MEVQaw+gHh8CVKEwsAcAY36FnzN+TmkET0rbCljXf6oml7Atfr7uRUvnF8INlE/u4ts0EqR3FQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=W8QMqYKu; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="W8QMqYKu" 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 66EJCber303757; Tue, 14 Jul 2026 23:22:17 GMT 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=IuAPCEwGsXTZACmaF feSITIpKFmRoyRnCy9SontkZ9Q=; b=W8QMqYKu7cLWQb19rqmObelCoAK97MUbS sWDVuH35DBv1EvrzPXfTvFpC92SIlFxDKL27wbn9hwQSuw7z44l+6HoCGOVoOxE2 xlk2k1Jo/kqNA9xPfayl6HprVpYZ+HEdzBBSVWTgSFIdOmvqY7GD21cSQH7n3lqF tQ41TsR6BWIiAibTDJbgF3isYCXm/x+ElVidDyrMfsk4ZVF7yEZ/egCQBQi103lT /QhW4m+aHtOs3f1gzb9YUnrLUG1x2uqycxzjoo/7SLGCainWHwmg8Uq5c2gusCXL sf4JFXBpYSJ2+/33gg+KUM4SieryyXR2PhH+Hbl2amczQmD0ms9lA== 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 4fcv339a7j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Jul 2026 23:22:17 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66ENJdqd023960; Tue, 14 Jul 2026 23:22:16 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fc2uy4vrd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Jul 2026 23:22:16 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66ENMC9r29360628 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 14 Jul 2026 23:22:12 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 694912004D; Tue, 14 Jul 2026 23:22:12 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 489A920043; Tue, 14 Jul 2026 23:22:12 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav03.fra02v.mail.ibm.com (Postfix) with SMTP; Tue, 14 Jul 2026 23:22:12 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4958) id 2E092162688; Wed, 15 Jul 2026 01:22:12 +0200 (CEST) From: Eric Farman To: linux-s390@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Matthew Rosato , Halil Pasic , Christian Borntraeger , Eric Farman , stable@vger.kernel.org, Farhan Ali Subject: [PATCH v1 3/6] s390/vfio_ccw: free all memory if cp_init() fails Date: Wed, 15 Jul 2026 01:22:05 +0200 Message-ID: <20260714232208.1683788-4-farman@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260714232208.1683788-1-farman@linux.ibm.com> References: <20260714232208.1683788-1-farman@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-s390@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE0MDI0MCBTYWx0ZWRfXwdv6a80xG4rh xkIxKAQSakSI4LsXm5c3lZhiYNb86xqoILhGtgO/S8awBAtnk9OxEhlFUjTm9fFaZBONMIVwHUm zXNqMXE6QJJPeuT53MTSRfNeXlAcUzs= X-Authority-Analysis: v=2.4 cv=Mp1iLWae c=1 sm=1 tr=0 ts=6a56c4a9 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=WEmllObKAWPfCt-5-jUA:9 X-Proofpoint-GUID: E-WMP9X3K04AAuVWdf3twjAFQlb2L7_g X-Proofpoint-ORIG-GUID: E-WMP9X3K04AAuVWdf3twjAFQlb2L7_g X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE0MDI0MCBTYWx0ZWRfX1s7WT5QCetbk p3mTkRQGLHP+geSGair1n/ni99hHQFqRhfUu3/ly0IscjlFniq+8kvasj4Fxb7aLjRbqpgBlO1K kyv8y0+osHL1cMX2avE+f4xJC3yugXw5qslTVekdXMN+V4+92A7UTwgFxSkGB9rJgFQxAgAE0+V ohhpKrpVsG5mYkyu5g5FNGRH8QlAKnvARVoLx54avfpdC7be7IQlWeJeWsRAKknrA4jXNMD0N/q bOo+6NA6I2FGMBsd4QWRXQW88kVtl9Hl7niRFT3wRC/xPr+z7tzSz4/xNnsCNkX35E2j9hfkmUa kTGvW9qSXP2Zww/++OxTRdsMfJJmScsyJwt2wfPa/DJ5FFSwNNvoMy75dqJPh076y5Mqu1KVahD j5r3t73JMs3QZLqXE/R7uyDJep44r/9YB1xTuwh8cYV9zxM7Vz4vV01MunCC2LeCvtrvXmqP0am n07Yc8NFWESJWSFe+dQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-14_05,2026-07-14_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 bulkscore=0 spamscore=0 malwarescore=0 lowpriorityscore=0 impostorscore=0 priorityscore=1501 suspectscore=0 clxscore=1011 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607140240 The routine cp_free() is called to unpin/free any memory once an I/O is completed successfully, or if cp_prefetch() fails. But if cp_init() fails, and cp->initialized is not enabled, the same routine cannot be used to free all the memory. An attempt to address this exists in ccwchain_handle_ccw(), where a single call to ccwchain_free() is made for the currently-processed CCW segment. But this will leak other segments (created as a result of a Transfer in Channel) that had been allocated as part of the same channel program. Address this by performing the cleanup outside of the recursive ccwchain_handle_ccw()/ccwchain_loop_tic() logic. Fixes: 8b515be512a2 ("vfio-ccw: Fix memory leak and don't call cp_free in= cp_init") Cc: stable@vger.kernel.org Cc: Farhan Ali Signed-off-by: Eric Farman --- drivers/s390/cio/vfio_ccw_cp.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/s390/cio/vfio_ccw_cp.c b/drivers/s390/cio/vfio_ccw_c= p.c index 76632b18fc37..74b1f25e01e7 100644 --- a/drivers/s390/cio/vfio_ccw_cp.c +++ b/drivers/s390/cio/vfio_ccw_cp.c @@ -459,9 +459,6 @@ static int ccwchain_handle_ccw(dma32_t cda, struct ch= annel_program *cp) /* Loop for tics on this new chain. */ ret =3D ccwchain_loop_tic(chain, cp); =20 - if (ret) - ccwchain_free(chain); - return ret; } =20 @@ -490,6 +487,23 @@ static int ccwchain_loop_tic(struct ccwchain *chain,= struct channel_program *cp) return 0; } =20 +static int ccwchain_build_ccws(dma32_t cda, struct channel_program *cp) +{ + struct ccwchain *chain, *temp; + int ret; + + ret =3D ccwchain_handle_ccw(cda, cp); + + if (ret) { + /* Cleanup if an error occurred */ + list_for_each_entry_safe(chain, temp, &cp->ccwchain_list, next) { + ccwchain_free(chain); + } + } + + return ret; +} + static int ccwchain_fetch_tic(struct ccw1 *ccw, struct channel_program *cp) { @@ -740,7 +754,7 @@ int cp_init(struct channel_program *cp, union orb *or= b) memcpy(&cp->orb, orb, sizeof(*orb)); =20 /* Build a ccwchain for the first CCW segment */ - ret =3D ccwchain_handle_ccw(orb->cmd.cpa, cp); + ret =3D ccwchain_build_ccws(orb->cmd.cpa, cp); =20 if (!ret) cp->initialized =3D true; --=20 2.53.0