From patchwork Sat Feb 15 05:44:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuai Xue X-Patchwork-Id: 13975957 Received: from out30-113.freemail.mail.aliyun.com (out30-113.freemail.mail.aliyun.com [115.124.30.113]) (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 DED3819F419; Sat, 15 Feb 2025 05:44:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.113 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739598286; cv=none; b=UMgEyJ+u+1MKNueQMWxL+BjaJkltu7cb19byzLD+MzSyEorYwib1T6bayKakGZ5lWOGxHezxEsCVGtdZC3hWAXCR+Kav5K1VYS0vgUStc+2o9talYLv58CFUo8J1cnDeBZ8PaP5ewQUdB1N4u7caUNTU4w4lvF2v27cDMZArypQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739598286; c=relaxed/simple; bh=kHWOKaugnCugIRfbWHpMJb0nYUXoXLMBAwcA+g+xgrs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pN4OU+ZhBVSB61WpnXALeiBU1aHqjVpHfRysSOhElOlz+TJLgE9idPblQqgmJDsWUC2JSDXsNCcJNJmQI7/O/paGu+2ctPGBzzuD+W2ueB+tg/Cfpw2XRlGbP9pcHqW9PYi+sGWyjygiHIVqdRQDjlVU8J1sWu4pvgQe1ysCtS0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=yXBp7FAj; arc=none smtp.client-ip=115.124.30.113 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="yXBp7FAj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1739598276; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=Ip3C2z8pFwpxrfoRX4KLEGAhWo1Y0wrskFEhejStJcE=; b=yXBp7FAj2/7kSggJ95Cr2ayM2Bls5y1CATV9iYuW8kF2OVLZqZO6O7dwx8p0gwPJIdN2BNtCuEMDn1I8gWyJM/Wn05ZCdlL7hKYsgEtSfMMKlFRqYlqD3L/I7W14x+t57Y67CHQj/GIypR2x7I/5j1VpPj2FFa2VX3ei1EqLR0I= Received: from localhost.localdomain(mailfrom:xueshuai@linux.alibaba.com fp:SMTPD_---0WPSysO9_1739598275 cluster:ay36) by smtp.aliyun-inc.com; Sat, 15 Feb 2025 13:44:36 +0800 From: Shuai Xue To: vinicius.gomes@intel.com, dave.jiang@intel.com, vkoul@kernel.org Cc: nikhil.rao@intel.com, xueshuai@linux.alibaba.com, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/7] dmaengine: idxd: fix memory leak in error handling path of idxd_pci_probe Date: Sat, 15 Feb 2025 13:44:29 +0800 Message-ID: <20250215054431.55747-6-xueshuai@linux.alibaba.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20250215054431.55747-1-xueshuai@linux.alibaba.com> References: <20250215054431.55747-1-xueshuai@linux.alibaba.com> Precedence: bulk X-Mailing-List: dmaengine@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Memory allocated for idxd is not freed if an error occurs during idxd_pci_probe(). To fix it, free the allocated memory in the reverse order of allocation before exiting the function in case of an error. Fixes: bfe1d56091c1 ("dmaengine: idxd: Init and probe for Intel data accelerators") Signed-off-by: Shuai Xue Reviewed-by: Dave Jiang --- drivers/dma/idxd/init.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c index dc34830fe7c3..ac1cdc1d82bf 100644 --- a/drivers/dma/idxd/init.c +++ b/drivers/dma/idxd/init.c @@ -550,6 +550,14 @@ static void idxd_read_caps(struct idxd_device *idxd) idxd->hw.iaa_cap.bits = ioread64(idxd->reg_base + IDXD_IAACAP_OFFSET); } +static void idxd_free(struct idxd_device *idxd) +{ + put_device(idxd_confdev(idxd)); + bitmap_free(idxd->opcap_bmap); + ida_free(&idxd_ida, idxd->id); + kfree(idxd); +} + static struct idxd_device *idxd_alloc(struct pci_dev *pdev, struct idxd_driver_data *data) { struct device *dev = &pdev->dev; @@ -1219,7 +1227,7 @@ int idxd_pci_probe_alloc(struct idxd_device *idxd, struct pci_dev *pdev, err: pci_iounmap(pdev, idxd->reg_base); err_iomap: - put_device(idxd_confdev(idxd)); + idxd_free(idxd); err_idxd_alloc: pci_disable_device(pdev); return rc;