Thread (6 messages) 6 messages, 3 authors, 2022-02-07

Re: [PATCH] Drivers: hv: vmbus: Fix memory leak in vmbus_add_channel_kobj

From: Wei Liu <wei.liu@kernel.org>
Date: 2022-02-03 12:44:37
Also in: lkml

On Fri, Jan 28, 2022 at 01:56:04PM -0800, Juan Vazquez wrote:
On Wed, Jan 26, 2022 at 05:52:46AM +0000, Miaoqian Lin wrote:
quoted
kobject_init_and_add() takes reference even when it fails.
According to the doc of kobject_init_and_add():

   If this function returns an error, kobject_put() must be called to
   properly clean up the memory associated with the object.

Fix memory leak by calling kobject_put().

Fixes: c2e5df616e1a ("vmbus: add per-channel sysfs info")
Signed-off-by: Miaoqian Lin <redacted>
---
 drivers/hv/vmbus_drv.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index 17bf55fe3169..9e055697783b 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -2028,8 +2028,10 @@ int vmbus_add_channel_kobj(struct hv_device *dev, struct vmbus_channel *channel)
 	kobj->kset = dev->channels_kset;
 	ret = kobject_init_and_add(kobj, &vmbus_chan_ktype, NULL,
 				   "%u", relid);
-	if (ret)
+	if (ret) {
+		kobject_put(kobj);
 		return ret;
+	}
 
 	ret = sysfs_create_group(kobj, &vmbus_chan_group);
If sysfs_create_group() fails same cleanup I think is required.

Later kobject_uevent() may fail according to doc, but there is no error
handling, maybe a good moment to consider adding it and do same cleanup.
Miaoqian, are you going to post a new version to address Juan's comment
here?

Thanks,
Wei.
quoted
 
-- 
2.17.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help