From: Junhao He <hejunhao3@huawei.com>
To: <will@kernel.org>, <jonathan.cameron@huawei.com>,
<yangyicong@huawei.com>, <shaojijie@huawei.com>
Cc: <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>, <linuxarm@huawei.com>,
<prime.zeng@hisilicon.com>, <hejunhao3@huawei.com>,
<chenhao418@huawei.com>
Subject: [PATCH 3/3] drivers/perf: hisi: hns3: Actually use devm_add_action_or_reset()
Date: Thu, 25 Apr 2024 20:46:27 +0800 [thread overview]
Message-ID: <20240425124627.13764-4-hejunhao3@huawei.com> (raw)
In-Reply-To: <20240425124627.13764-1-hejunhao3@huawei.com>
From: Hao Chen <chenhao418@huawei.com>
pci_alloc_irq_vectors() allocates an irq vector. When devm_add_action()
fails, the irq vector is not freed, which leads to a memory leak.
Replace the devm_add_action with devm_add_action_or_reset to ensure
the irq vector can be destroyed when it fails.
Fixes: 66637ab137b4 ("drivers/perf: hisi: add driver for HNS3 PMU")
Signed-off-by: Hao Chen <chenhao418@huawei.com>
Signed-off-by: Junhao He <hejunhao3@huawei.com>
---
drivers/perf/hisilicon/hns3_pmu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/perf/hisilicon/hns3_pmu.c b/drivers/perf/hisilicon/hns3_pmu.c
index cbdd53b0a034..60062eaa342a 100644
--- a/drivers/perf/hisilicon/hns3_pmu.c
+++ b/drivers/perf/hisilicon/hns3_pmu.c
@@ -1527,7 +1527,7 @@ static int hns3_pmu_irq_register(struct pci_dev *pdev,
return ret;
}
- ret = devm_add_action(&pdev->dev, hns3_pmu_free_irq, pdev);
+ ret = devm_add_action_or_reset(&pdev->dev, hns3_pmu_free_irq, pdev);
if (ret) {
pci_err(pdev, "failed to add free irq action, ret = %d.\n", ret);
return ret;
--
2.33.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2024-04-25 12:49 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-25 12:46 [PATCH 0/3] drivers/perf: hisi: Fixed some issues with hisi pmu Junhao He
2024-04-25 12:46 ` [PATCH 1/3] drivers/perf: hisi_pcie: Fix out-of-bound access when valid event group Junhao He
2024-04-26 10:19 ` Jijie Shao
2024-04-26 15:40 ` Jonathan Cameron
2024-04-25 12:46 ` [PATCH 2/3] drivers/perf: hisi: hns3: " Junhao He
2024-04-26 10:19 ` Jijie Shao
2024-04-26 15:41 ` Jonathan Cameron
2024-04-25 12:46 ` Junhao He [this message]
2024-04-26 10:17 ` [PATCH 3/3] drivers/perf: hisi: hns3: Actually use devm_add_action_or_reset() Jijie Shao
2024-04-26 15:42 ` Jonathan Cameron
2024-04-28 8:59 ` [PATCH 0/3] drivers/perf: hisi: Fixed some issues with hisi pmu Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240425124627.13764-4-hejunhao3@huawei.com \
--to=hejunhao3@huawei.com \
--cc=chenhao418@huawei.com \
--cc=jonathan.cameron@huawei.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=prime.zeng@hisilicon.com \
--cc=shaojijie@huawei.com \
--cc=will@kernel.org \
--cc=yangyicong@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).