From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Ofir Bitton <obitton@habana.ai>, Oded Gabbay <ogabbay@kernel.org>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 5.4 04/14] habanalabs: put devices before driver removal
Date: Sat, 12 Dec 2020 11:08:21 -0500 [thread overview]
Message-ID: <20201212160831.2335172-4-sashal@kernel.org> (raw)
In-Reply-To: <20201212160831.2335172-1-sashal@kernel.org>
From: Ofir Bitton <obitton@habana.ai>
[ Upstream commit 5555b7c56bdec7a29c789fec27f84d40f52fbdfa ]
Driver never puts its device and control_device objects, hence
a memory leak is introduced every driver removal.
Signed-off-by: Ofir Bitton <obitton@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/misc/habanalabs/device.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/misc/habanalabs/device.c b/drivers/misc/habanalabs/device.c
index a7a4fed4d8995..3eeb1920ddb43 100644
--- a/drivers/misc/habanalabs/device.c
+++ b/drivers/misc/habanalabs/device.c
@@ -229,16 +229,16 @@ delete_cdev_device:
static void device_cdev_sysfs_del(struct hl_device *hdev)
{
- /* device_release() won't be called so must free devices explicitly */
- if (!hdev->cdev_sysfs_created) {
- kfree(hdev->dev_ctrl);
- kfree(hdev->dev);
- return;
- }
+ if (!hdev->cdev_sysfs_created)
+ goto put_devices;
hl_sysfs_fini(hdev);
cdev_device_del(&hdev->cdev_ctrl, hdev->dev_ctrl);
cdev_device_del(&hdev->cdev, hdev->dev);
+
+put_devices:
+ put_device(hdev->dev);
+ put_device(hdev->dev_ctrl);
}
/*
@@ -1285,9 +1285,9 @@ sw_fini:
early_fini:
device_early_fini(hdev);
free_dev_ctrl:
- kfree(hdev->dev_ctrl);
+ put_device(hdev->dev_ctrl);
free_dev:
- kfree(hdev->dev);
+ put_device(hdev->dev);
out_disabled:
hdev->disabled = true;
if (add_cdev_sysfs_on_err)
--
2.27.0
next prev parent reply other threads:[~2020-12-12 16:31 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-12 16:08 [PATCH AUTOSEL 5.4 01/14] drm/tegra: replace idr_init() by idr_init_base() Sasha Levin
2020-12-12 16:08 ` [PATCH AUTOSEL 5.4 02/14] kernel/cpu: add arch override for clear_tasks_mm_cpumask() mm handling Sasha Levin
2020-12-12 16:08 ` [PATCH AUTOSEL 5.4 03/14] drm/tegra: sor: Disable clocks on error in tegra_sor_init() Sasha Levin
2020-12-12 16:08 ` Sasha Levin [this message]
2020-12-12 16:08 ` [PATCH AUTOSEL 5.4 05/14] arm64: syscall: exit userspace before unmasking exceptions Sasha Levin
2020-12-12 16:08 ` [PATCH AUTOSEL 5.4 06/14] vxlan: Add needed_headroom for lower device Sasha Levin
2020-12-12 16:08 ` [PATCH AUTOSEL 5.4 07/14] vxlan: Copy needed_tailroom from lowerdev Sasha Levin
2020-12-12 16:08 ` [PATCH AUTOSEL 5.4 08/14] scsi: storvsc: Validate length of incoming packet in storvsc_on_channel_callback() Sasha Levin
2020-12-12 16:08 ` [PATCH AUTOSEL 5.4 09/14] scsi: mpt3sas: Increase IOCInit request timeout to 30s Sasha Levin
2020-12-12 16:08 ` [PATCH AUTOSEL 5.4 10/14] dm table: Remove BUG_ON(in_interrupt()) Sasha Levin
2020-12-12 16:08 ` [PATCH AUTOSEL 5.4 11/14] iwlwifi: pcie: add one missing entry for AX210 Sasha Levin
2020-12-12 16:08 ` [PATCH AUTOSEL 5.4 12/14] drm/amd/display: Init clock value by current vbios CLKs Sasha Levin
2020-12-12 16:08 ` [PATCH AUTOSEL 5.4 13/14] perf/x86/intel: Check PEBS status correctly Sasha Levin
2020-12-12 16:08 ` [PATCH AUTOSEL 5.4 14/14] kbuild: avoid split lines in .mod files Sasha Levin
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=20201212160831.2335172-4-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=obitton@habana.ai \
--cc=ogabbay@kernel.org \
--cc=stable@vger.kernel.org \
/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