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 5C80E1D435F for ; Fri, 7 Aug 2026 17:45:58 +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=1786124759; cv=none; b=MSLVLCQHPaW3/uqVNXJ7bXtDa7YIhADr0MRNaRbrOci6Rear3HBVaeqMwe4Y94C2MajBtHWsyxFbr7Iphn0euLu1BxmFpXYem2sNxtRYZY6YkQ8VFkwIEuV7pK0oZvlKdTa6XKZgoAYpNIjIq94V/46slDdR4t51NaNtfVGRkuk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786124759; c=relaxed/simple; bh=J1rx6b2/HsGD8Mil2pcZ06tE4mIRTYdsBR03JLTnrIE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZgBg5UlwwRK4zzs4cwDPZcvdFKOUNeSIvMQYXNTPdUwa+FemlprjhR7G9fbcQOCtV3WZm3KVbIhhFGZyfMKpkGlG2F63gpbc2G5VIDtiQcrUXgr4GuRY5imkDX4UlSh82zqvpkXc7VyYEG5YN0SRcnDOevq5n4/8USeFE6IvRCQ= 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=VfhSaJl4; 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="VfhSaJl4" 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 677Glh3R1936821; Fri, 7 Aug 2026 17:45:55 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=z+YqWTvHbxDdYTnkr k/nH7TwxPLL/74BI8uK9GjX4DE=; b=VfhSaJl4NrRGA3hVSWvS+JY8b8hbBzs1r xPB/8jpSZijGUFmEOU6LtN4fMhBf2voCzeNaOjqCiR1KSRyHg5+YzSufJ/CEhuzt gGSnjQJfsCSkM/R+51utoasJhxCT0kEb0Lv3n7Fdeblqr5sTyr7Pqgp5cte79C2P Hw0THDIr1ZaArkQoRYTiA+QHBn2p42Xkv8BiVD9pKeRMeHimHTH7F0DIuthaj+IB 1M+L7DHPExMRx+DQC1xpBJkM6eINNquQn/5aLNSMO40O7vt+STjeAcD3F+vQH7Tg 0UZbzynPDvBoW8EbdB64KhpzPnfJ0bKrWP3v4Lr+FYDma8hqhC4GQ== 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 4fvy02500p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Aug 2026 17:45:55 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 677HfL4w013023; Fri, 7 Aug 2026 17:45:54 GMT Received: from smtprelay02.wdc07v.mail.ibm.com ([172.16.1.69]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fswbgrhgb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Aug 2026 17:45:54 +0000 (GMT) Received: from smtpav04.dal12v.mail.ibm.com (smtpav04.dal12v.mail.ibm.com [10.241.53.103]) by smtprelay02.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 677Hjqms28967510 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 7 Aug 2026 17:45:52 GMT Received: from smtpav04.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7E7865805E; Fri, 7 Aug 2026 17:45:52 +0000 (GMT) Received: from smtpav04.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DEC9858052; Fri, 7 Aug 2026 17:45:51 +0000 (GMT) Received: from IBM-D32RQW3.ibm.com (unknown [9.61.250.14]) by smtpav04.dal12v.mail.ibm.com (Postfix) with ESMTP; Fri, 7 Aug 2026 17:45:51 +0000 (GMT) From: Farhan Ali To: stable@vger.kernel.org, gregkh@linuxfoundation.org, sashal@kernel.org Cc: alifm@linux.ibm.com, Christian Borntraeger , Matthew Rosato Subject: [PATCH v1 2/3] KVM: s390: pci: Fix missing error codes and memory unaccounting Date: Fri, 7 Aug 2026 10:45:49 -0700 Message-ID: <20260807174551.2359-3-alifm@linux.ibm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260807174551.2359-1-alifm@linux.ibm.com> References: <20260807174551.2359-1-alifm@linux.ibm.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: Iih8HoG3NQ4-uSXbWemb8CY6yR1hzt6H X-Authority-Analysis: v=2.4 cv=e5k2j6p/ c=1 sm=1 tr=0 ts=6a7619d3 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=g4erIPh_aaDScpLpsJUA:9 X-Proofpoint-GUID: Iih8HoG3NQ4-uSXbWemb8CY6yR1hzt6H X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODA3MDEzNSBTYWx0ZWRfX4gUKALpT0kBz fbjv6XD3xhT2RIJzpM92oGXICUCE44uK8G5lM1GOUoAun/PX/yM9r0cNK4BgMV35NJz2yvrloU9 Io1BBGxc/d6TXPgFhZu0/6px8KxH4i32qPGVDZ/lqWES6yDYNVR8NlPzngtp+h046UiV2bVsBr8 txB5tjUIjtodMgSTnXD7RE9S14yg6e7WnVEidFJ0e6TSx2PnB6W/mt86kWAQ23KqtUijD7ccYTq uYYKEx2jj3/kaiPZxQYORpHKM0LR55r3QuAxnXZGOTrF4H+ejMc96qc66Y6+bxx/UKyXhek3Bly +AVUtLt793LTBdCOwC7dmQE8ea/N/E2dhC8+HtQ9RDvy93oN/gP4Yx5eY3m8VYgcz+4iaWs7clj SVLQr1o5Z9Vwxg5EsgYS9D8Xbjppm/5Uby0z5XbD6LVvNAbYgy5iEE0MDFqupdIa5fF2yoxqNC6 J62ki+S73l5P1bbvO/w== X-Proofpoint-Spam-Info: AW1haW4tMjYwODA3MDEzNSBTYWx0ZWRfX9hkz1t3/ESwa AjyFI4QwQeb/wgRqQRw59S1+p7UtxeUuwfIKc2+JdHWyNMY4QwNYCdXFJlNQ+LH6tZkn9MabAVp diMfpsBXmgAE0dDltCSHR77+0wy9i+E= 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-08-07_03,2026-08-07_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 impostorscore=0 priorityscore=1501 adultscore=0 phishscore=0 clxscore=1015 malwarescore=0 spamscore=0 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608070135 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 (cherry picked from commit f86842e4d6c482300f4567f492d512c9ccf5bc4f) --- 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 73989825b49a..7ee1f892c7fd 100644 --- a/arch/s390/kvm/pci.c +++ b/arch/s390/kvm/pci.c @@ -297,14 +297,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 | @@ -348,6 +351,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.43.0