From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 525D01F2B88; Sun, 26 Jul 2026 04:01:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785038499; cv=none; b=jnXo4YIjYcdMTmlRAD5NCK26va7dpBCtc/xte+ieDN5kYgmITHBqdaW8OudTGhudDpZTnjArG38nMq3grXAZOsX5LsH2YxcYWVFzwn7YVvdYPrL99kivsMEJgBAyHmVh5IJs+6Q9s1HwBcxNBU/wHroWlK7ym1Z+lc89oJnUVDw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785038499; c=relaxed/simple; bh=n+mbvvJEI8CH8TTkOdaxw00F0Fq88vljPQWMjBMIOp4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=a1KRkwasWTagWd8NP3fK+mMWUXG6T0eieBUD6dZ7MC0eec1hdxKB1Jchvpxca4n7phpMXGfCSGsDShKlJoZmJ3qOhWiPrgtiAxmZ4riMQ08iL6Vev6vueDxf8taVGSGL8AEn59NqOwWH4NAvcWTocAQDvGFR1zgu6mj9HMMVYlg= 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=frD6Htch; arc=none smtp.client-ip=148.163.158.5 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="frD6Htch" 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 66PNHs9k1945002; Sun, 26 Jul 2026 04:01:37 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=gW7VP8CspOGU+wF0/ N72fT1Tle3KtK4wWLpeUE28hPo=; b=frD6Htch4sAIB575pwvSn7hc3OtoXtUqo 66T6EV90KfyWxRvMWUL9lxyS+L+czPVmPdPS0DM0umrZacwGiRJbw5QAeyM1krEz N3OSvjMEIahf6BDFLYjGJVNE134H2Iw2nT/lWGELMgtN+VBz33ZkD6PuccwnPDIw VEdDf+H8/sFyUguQO5kUKh3lsanmrJv1HgnHw+kxUfdkrURZLY0pIJqyvAtjBE6W 7dKwe5RvIZBG3A1rFrnaCgjVEfKYGh/HuLJgWvo5KRG3QsFy5GEs//as5XQbw0Vv YH6g4OkgShKmatDkHUmuhGcBBCdghW1Op5GTbSsvE6kywu4RmSq8A== 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 4fmuwcj87h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 26 Jul 2026 04:01:37 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66Q3uZpj032296; Sun, 26 Jul 2026 04:01:36 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fn8fjrbcp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 26 Jul 2026 04:01:36 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66Q41WDf27460012 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 26 Jul 2026 04:01:32 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6414D200FF; Sun, 26 Jul 2026 04:01:32 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3BED4200EF; Sun, 26 Jul 2026 04:01:32 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav04.fra02v.mail.ibm.com (Postfix) with SMTP; Sun, 26 Jul 2026 04:01:32 +0000 (GMT) Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4958) id 2162D162811; Sun, 26 Jul 2026 06:01:32 +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 Subject: [PATCH v5 03/10] s390/vfio_ccw: fix out of bounds check on CCW array Date: Sun, 26 Jul 2026 06:01:22 +0200 Message-ID: <20260726040129.2946151-4-farman@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260726040129.2946151-1-farman@linux.ibm.com> References: <20260726040129.2946151-1-farman@linux.ibm.com> Precedence: bulk X-Mailing-List: kvm@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-ORIG-GUID: bzdUXUqJWJemfydR-ECGt_5UMTZJtlCT X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI2MDAzMyBTYWx0ZWRfX8CWwPe6yoKBB 62+j3qzDdJrUtJoR57hC42EnJ7JoP10JvzJ8WBbFDcAKD54Wmds++m8dEHiN92/OJ3wVScfQeaz 142pph3s3U70ufpfT6Rocr7N0b3bmEA= X-Authority-Analysis: v=2.4 cv=E/z9Y6dl c=1 sm=1 tr=0 ts=6a6586a1 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=RzCfie-kr_QcCd8fBx8p:22 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=A5C3NnK3Tz1osX5E1PIA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI2MDAzMyBTYWx0ZWRfX6WMBIK/nUgEO TcSdvxs+yh5EkYIt0AL2dG+s1rcLCtKPXcmmdWUxvuNAfQxEJmc9JBSh2/zAoGjBqCNkwzyqK42 eYAnkcakng3DTPIjMjESBc5RGa0FiShD9N5MEnZi2WiYjD/MB3wZ9v1Ek0F0ZWjcZgolreOeZQ4 3q+4B9sjGu8PufBCXqw+lWn6PgZcNYILPhGsznh7vTk9sAc+cE0nCQSa/v5AashQAj2B7BCcmMF ebKuF0+0GAAbe6Llg8FpyM6WP0qUiBXCjhTvExv5kO/FsT7bZANX4tCJCg6ii5PjrAV5UYQpV33 d55M/H4bu0cV78ucnRyny9g4ckeLATvp5NRGSVHD8L7WE+++xBEMX3QvHsqiV2USvuwHT9CnBuU R9ca3CR5Ca7r+xh0I7UTaLChsNRAe8wdu1NAg7VS/lTScE5UbsD2ZwM7Rf9+mOFEfMRhkMAJhAj +nwHAeS19MCbyZ02UHw== X-Proofpoint-GUID: bzdUXUqJWJemfydR-ECGt_5UMTZJtlCT 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-25_07,2026-07-24_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 priorityscore=1501 spamscore=0 clxscore=1015 phishscore=0 lowpriorityscore=0 bulkscore=0 malwarescore=0 impostorscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607260033 The routine ccwchain_calc_length() counts the number of channel command words (CCWs) that are chained together in a single channel program, and rejects anything larger than CCWCHAIN_LEN_MAX (256) CCWs. The loop itself is "do..while (count < 257)", and while the logic in is_cpa_within_range() correctly adjusts between the 0-index array of CCWs and the count of CCWs starting at 1, this means it would look at a possible 257th CCW before ending the loop and (correctly) returning an error. Fix this by restructuring the loop to break as soon as 256 CCWs (thus indexes 0-255) are examined, without looking at memory outside the range. Fixes: 0a19e61e6d4c ("vfio: ccw: introduce channel program interfaces") Cc: stable@vger.kernel.org Reviewed-by: Matthew Rosato Signed-off-by: Eric Farman --- drivers/s390/cio/vfio_ccw_cp.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/drivers/s390/cio/vfio_ccw_cp.c b/drivers/s390/cio/vfio_ccw_c= p.c index 1c2890d139c6..af632f9d5453 100644 --- a/drivers/s390/cio/vfio_ccw_cp.c +++ b/drivers/s390/cio/vfio_ccw_cp.c @@ -377,11 +377,9 @@ static void ccwchain_cda_free(struct ccwchain *chain= , int idx) static int ccwchain_calc_length(u64 iova, struct channel_program *cp) { struct ccw1 *ccw =3D cp->guest_cp; - int cnt =3D 0; - - do { - cnt++; + int cnt; =20 + for (cnt =3D 1; cnt <=3D CCWCHAIN_LEN_MAX; cnt++, ccw++) { /* * We want to keep counting if the current CCW has the * command-chaining flag enabled, or if it is a TIC CCW @@ -391,15 +389,10 @@ static int ccwchain_calc_length(u64 iova, struct ch= annel_program *cp) * after the TIC, depending on the results of its operation. */ if (!ccw_is_chain(ccw) && !is_tic_within_range(ccw, iova, cnt)) - break; - - ccw++; - } while (cnt < CCWCHAIN_LEN_MAX + 1); - - if (cnt =3D=3D CCWCHAIN_LEN_MAX + 1) - cnt =3D -EINVAL; + return cnt; + } =20 - return cnt; + return -EINVAL; } =20 static int tic_target_chain_exists(struct ccw1 *tic, struct channel_prog= ram *cp) --=20 2.53.0