From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 EBE193F0A83; Wed, 20 May 2026 17:25:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779297908; cv=none; b=O7a19VSS14lQOpoVRWejBZ2C79yvYBPcmLw7FlYnZMYb6MSIKNTFROb7Vjf18YCT+qI2Dezmbp/2NRHln4+0z69tKVY8JikyIPK3+kQNCzLmPwuo604KhcsMz2bBxla2n/3CJtHhOAUyXMTevuorKhyLxP4v8oKmpsZaQE0pcLA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779297908; c=relaxed/simple; bh=j18ZJkPTGGXaEAL9Z+UzW9LZGFBmj6IbALy+L51Qqtw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=emx8Vxu2WwYGDoqO3GAG3SF8c3KT44737W9LEcLlEscoWLvQr4nYgYVDdxdAvhuumuaG+iguTC/gUbGQFn+d1mU3QUegfaqPLPyW8p8jTCwV4XghNvQL7tlRbkgTPSD5JRbKUtO6Q4+vkBvIDHPCg0nFjr8MyV28X5i+g3kRD2U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dfIY94/4; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="dfIY94/4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FEA91F000E9; Wed, 20 May 2026 17:25:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779297906; bh=K8SLiBo9JjrK43PPlO7w/n0YZ7hW9lsBefK+r+nY+Xw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dfIY94/4t2iTkQ93Ll9z86yZ4ckMqaE8F6aospAfZIxDn2qHpikmtWFkkVftHx5fF nlt5wN+iLsTCoZtp0NensCVThc/zRxIWl8dsPoEFZ8zuQVTvtvy0mMS7EyrAr/kowg 8SzwIl9I4ebLJKqZts41pPE/PEkN/ZksCpBPNWCE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Senchuan Zhang , Manivannan Sadhasivam , Manivannan Sadhasivam , Sasha Levin Subject: [PATCH 6.18 208/957] PCI: dwc: Perform cleanup in the error path of dw_pcie_resume_noirq() Date: Wed, 20 May 2026 18:11:31 +0200 Message-ID: <20260520162139.052013281@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162134.554764788@linuxfoundation.org> References: <20260520162134.554764788@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Manivannan Sadhasivam [ Upstream commit edb5ca3262e2255cf938a5948709d3472d4871ad ] If the dw_pcie_resume_noirq() API fails, it just returns the errno without doing cleanup in the error path, leading to resource leak. So perform cleanup in the error path. Fixes: 4774faf854f5 ("PCI: dwc: Implement generic suspend/resume functionality") Reported-by: Senchuan Zhang Closes: https://lore.kernel.org/linux-pci/78296255.3869.19c8eb694d6.Coremail.zhangsenchuan@eswincomputing.com Signed-off-by: Manivannan Sadhasivam Signed-off-by: Manivannan Sadhasivam Link: https://patch.msgid.link/20260226133951.296743-1-mani@kernel.org Signed-off-by: Sasha Levin --- drivers/pci/controller/dwc/pcie-designware-host.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index 3fbece96faaad..48e4a887bb1bb 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -1230,15 +1230,24 @@ int dw_pcie_resume_noirq(struct dw_pcie *pci) ret = dw_pcie_start_link(pci); if (ret) - return ret; + goto err_deinit; ret = dw_pcie_wait_for_link(pci); - if (ret) - return ret; + if (ret == -ETIMEDOUT) + goto err_stop_link; if (pci->pp.ops->post_init) pci->pp.ops->post_init(&pci->pp); + return 0; + +err_stop_link: + dw_pcie_stop_link(pci); + +err_deinit: + if (pci->pp.ops->deinit) + pci->pp.ops->deinit(&pci->pp); + return ret; } EXPORT_SYMBOL_GPL(dw_pcie_resume_noirq); -- 2.53.0