From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4268CC61DB3 for ; Tue, 20 Dec 2022 01:23:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233156AbiLTBXD (ORCPT ); Mon, 19 Dec 2022 20:23:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233115AbiLTBV7 (ORCPT ); Mon, 19 Dec 2022 20:21:59 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99517120AD; Mon, 19 Dec 2022 17:21:30 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 27EC761118; Tue, 20 Dec 2022 01:21:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C33B0C433EF; Tue, 20 Dec 2022 01:21:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671499289; bh=sOEQaiBYi+zp6/OlSa7oS1/xUx0Yez6SKBn9Qar5EPY=; h=From:To:Cc:Subject:Date:From; b=SOSQVHJcF3+0gc8vVgRQNauTqrp0NsJQKidlzhmy24fW6wplX4XlHmm+wiRMniECa Fu2163b1dEd8YWAJqtP2SV9bG8ZIgPgzwUigBdnOMsh9MgwlHk3oN2eHQZmo3uYY3m HU4TyCQ5N2VQNIITSeFVPGS1/JqOAG4guxDHishgpij5o7IaUuWSeurihz/JV4WoPZ CK71Tu+UPq0XAAGbh9uAH2ID2qJmSN9B1GZTULoh8jSbmauPK35SnN6c1TtwfbjzXO QusHBvedkbsYb7GZu8BpYsd/foaTFJYeNy3JBlzYbydjpTmRXpsn0CpBs7ggsmmFTv Xrzt27eiridJg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhiqi Song , Herbert Xu , Sasha Levin , liulongfang@huawei.com, davem@davemloft.net, linux-crypto@vger.kernel.org Subject: [PATCH AUTOSEL 6.0 01/16] crypto: hisilicon/hpre - fix resource leak in remove process Date: Mon, 19 Dec 2022 20:21:11 -0500 Message-Id: <20221220012127.1222311-1-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhiqi Song [ Upstream commit 45e6319bd5f2154d8b8c9f1eaa4ac030ba0d330c ] In hpre_remove(), when the disable operation of qm sriov failed, the following logic should continue to be executed to release the remaining resources that have been allocated, instead of returning directly, otherwise there will be resource leakage. Signed-off-by: Zhiqi Song Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/hisilicon/hpre/hpre_main.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/crypto/hisilicon/hpre/hpre_main.c b/drivers/crypto/hisilicon/hpre/hpre_main.c index 9d529df0eab9..13525793ff60 100644 --- a/drivers/crypto/hisilicon/hpre/hpre_main.c +++ b/drivers/crypto/hisilicon/hpre/hpre_main.c @@ -1287,18 +1287,12 @@ static int hpre_probe(struct pci_dev *pdev, const struct pci_device_id *id) static void hpre_remove(struct pci_dev *pdev) { struct hisi_qm *qm = pci_get_drvdata(pdev); - int ret; hisi_qm_pm_uninit(qm); hisi_qm_wait_task_finish(qm, &hpre_devices); hisi_qm_alg_unregister(qm, &hpre_devices); - if (qm->fun_type == QM_HW_PF && qm->vfs_num) { - ret = hisi_qm_sriov_disable(pdev, true); - if (ret) { - pci_err(pdev, "Disable SRIOV fail!\n"); - return; - } - } + if (qm->fun_type == QM_HW_PF && qm->vfs_num) + hisi_qm_sriov_disable(pdev, true); hpre_debugfs_exit(qm); hisi_qm_stop(qm, QM_NORMAL); -- 2.35.1