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 D18613EEAF9; Mon, 27 Jul 2026 09:57:35 +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=1785146257; cv=none; b=dQ8oWLJT6UDpNM9RqRlWvrhHoJaXAf/EuwMSdwQ6UP34LUX0LgPG5lzFE7pY6V+ZILWvdb8SX5NmSKvvPGUUFmCgqdwPwpHUV2KKyuwc5HJsrWgiARqnVzi8B+ae+V/zm9oBzOfWDjCWS+Dw3OUEXrzUtF14Q13Dmnqp0ASFbmo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785146257; c=relaxed/simple; bh=y5qeWYDLD9e5H37TL2AJcoe2y1xz9+/MK9xqpwp5FuY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pTDbUTIAoDN5hVWrsHKkl23rQSDUM2BZ21SQiAxVMhTiY1N3yruIL0cRUFfoSDDPztP2CSeEXbgRaTVG0A4L5wK2IMCLvKJH4yW5yv28wll9xs/9dnHD3wHRiyOXL57PAqTANU75/dOofQ8RIUIxi4VBHx5Tan9VYvooNYI/5cA= 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=PIH5mwKa; 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="PIH5mwKa" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66R9V6291743526; Mon, 27 Jul 2026 09:57:33 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=Bcvz0vcDDeB4zLt6B lWuYiP5dXJifgcJD0ghqI7JeR8=; b=PIH5mwKa0EEJLHt69we89pCj4mBpHxp1B B8tTQtFKv+lTqe5H424XMjA1K4z9UcXJfhogCwru/mE1sja6jMb3x6//4GR67MBl Esh2U9C3INLoVJVzBEGM1FQsRNU0/tSMvYntP3IZP4V7iNwGE0m/xIBH7OtKP+SF EfGb7h/B8JhYjvu+YpGAWOjji4rvDl/4C4I2A3D4jlI8dzbjqaDI3wBJ7ahXL5O6 COpDE0Wqw1oXgLvZbvmCk37ASI5n2EntgY/YNL1vJhszbygTaesO1PZhXE8oHo7J NL00RIFbLYeNgAz+sVC7e9jCiYWmoKjkPzTudAOcfc7pbM+fn8GkA== 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 4fmuyhxyhf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 27 Jul 2026 09:57:33 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66R9uRES017041; Mon, 27 Jul 2026 09:57:32 GMT Received: from smtprelay05.dal12v.mail.ibm.com ([172.16.1.7]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fn7fq50pf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 27 Jul 2026 09:57:32 +0000 (GMT) Received: from smtpav02.dal12v.mail.ibm.com (smtpav02.dal12v.mail.ibm.com [10.241.53.101]) by smtprelay05.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66R9vV4712845660 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jul 2026 09:57:31 GMT Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6D99858051; Mon, 27 Jul 2026 09:57:31 +0000 (GMT) Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 244405805A; Mon, 27 Jul 2026 09:57:29 +0000 (GMT) Received: from b35lp69.lnxne.boe (unknown [9.87.84.240]) by smtpav02.dal12v.mail.ibm.com (Postfix) with ESMTP; Mon, 27 Jul 2026 09:57:28 +0000 (GMT) From: Christian Borntraeger To: Paolo Bonzini Cc: KVM , Janosch Frank , Claudio Imbrenda , David Hildenbrand , linux-s390 , Christian Borntraeger , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Sven Schnelle , Matthew Rosato , Jaehoon Kim , Douglas Freimuth , Farhan Ali Subject: [GIT PULL 3/7] KVM: s390: pci: Fix missing error codes and memory unaccounting Date: Mon, 27 Jul 2026 11:57:16 +0200 Message-ID: <20260727095720.9150-4-borntraeger@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260727095720.9150-1-borntraeger@linux.ibm.com> References: <20260727095720.9150-1-borntraeger@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: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI3MDA5NiBTYWx0ZWRfX1HwrUCFKvXRz /sprlXumTkU9bjVX3pPK12jtLt1TktWaT9XPSteT6ej90byyHceUHxY34ZdJceX7eFd6Ri1MY9B cOaZwMiZDzjMAQn9YtN+YTRjBzkRM9E= X-Proofpoint-GUID: 09PDTYwDeIYC6UKqk0K5-qm8_6LPzoH4 X-Proofpoint-ORIG-GUID: 09PDTYwDeIYC6UKqk0K5-qm8_6LPzoH4 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI3MDA5NiBTYWx0ZWRfX8eqNdhHDiSyJ V+LF1DCVwKepD9u2ZzCwk1vakhuiAzUmVk3R2t+pEOyRPMp3FDthAauN8ZiZuPZI5RZVXm10wtd rPeMbF7QGEyKw0NlvtwJ/6iyIPRce4DOtNvRfIV10DWZiDoXC1l62eGSeVAjE7n3VjABuGaIGau IVwc8mSmrnhGBccafVYCy8AV/nYbDzdClSxlUPwmx0PlOLpWTUkhx1Pq1AgiGdTbe7yRxhxwqjv YEnL2ohP1npFkbpC/i+mAVwUMA3Eq2UCP17tcA9s3NXDQO9K70rzYVwe2/fe4oPAa05Y5yX6QIP ZySqYqQzEofHhzgB7iCk7jxmfNr1I7rzrPslXPIxzXLQkYsKxWOOyJeJz/3JJ6aOn42UcuLELce wMOPIUK3ME0CuIXM72ovzn5nuXWEqxgR1ZLkpUNXMxvnPJdPWYqytXJy7FXYB8Yi27SNWqOa6xT +CoGZYezIy33/zNuNUA== X-Authority-Analysis: v=2.4 cv=X5Vi7mTe c=1 sm=1 tr=0 ts=6a672b8d cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=VwQbUJbxAAAA:8 a=g4erIPh_aaDScpLpsJUA:9 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-27_02,2026-07-24_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 malwarescore=0 spamscore=0 suspectscore=0 bulkscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607270096 From: Farhan Ali In kvm_s390_pci_aif_enable() two error paths failed to set an error code, causing the function to return 0 on failure. It also failed to rollback memory accounting on failure. Fix both by propagating an error code on failure and calling unaccount_mem() in the cleanup path. Fixes: 3c5a1b6f0a18 ("KVM: s390: pci: provide routines for enabling/disabling interrupt forwarding") Cc: stable@vger.kernel.org Reviewed-by: Christian Borntraeger Reviewed-by: Matthew Rosato Signed-off-by: Farhan Ali Tested-by: Matthew Rosato Signed-off-by: Christian Borntraeger --- arch/s390/kvm/pci.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/s390/kvm/pci.c b/arch/s390/kvm/pci.c index 0741aed442bc..36eb30953bb5 100644 --- a/arch/s390/kvm/pci.c +++ b/arch/s390/kvm/pci.c @@ -300,14 +300,17 @@ static int kvm_s390_pci_aif_enable(struct zpci_dev *zdev, struct zpci_fib *fib, } /* Account for pinned pages, roll back on failure */ - if (account_mem(zdev->kzdev, pcount)) + rc = account_mem(zdev->kzdev, pcount); + if (rc) goto unpin2; /* AISB must be allocated before we can fill in GAITE */ mutex_lock(&aift->aift_lock); bit = airq_iv_alloc_bit(aift->sbv); - if (bit == -1UL) + if (bit == -1UL) { + rc = -ENOMEM; goto unlock; + } zdev->aisb = bit; /* store the summary bit number */ zdev->aibv = airq_iv_create(msi_vecs, AIRQ_IV_DATA | AIRQ_IV_BITLOCK | @@ -351,6 +354,8 @@ static int kvm_s390_pci_aif_enable(struct zpci_dev *zdev, struct zpci_fib *fib, return rc; unlock: + if (pcount > 0) + unaccount_mem(zdev->kzdev, pcount); mutex_unlock(&aift->aift_lock); unpin2: if (fib->fmt0.sum == 1) -- 2.53.0