summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiaoqian Lin <linmq006@gmail.com>2022-02-04 01:30:08 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-02-23 12:03:16 +0100
commitc377e2ba78d3fe9a1f0b4ec424e75f81da7e81e9 (patch)
tree6b0f185bb51c9cf05ab41b3fb693ee07e1a31793
parent6936f02d14eda3668eda8714e323c32ab666ba42 (diff)
downloadlinux-stable-c377e2ba78d3fe9a1f0b4ec424e75f81da7e81e9.tar.gz
linux-stable-c377e2ba78d3fe9a1f0b4ec424e75f81da7e81e9.tar.bz2
linux-stable-c377e2ba78d3fe9a1f0b4ec424e75f81da7e81e9.zip
Drivers: hv: vmbus: Fix memory leak in vmbus_add_channel_kobj
[ Upstream commit 8bc69f86328e87a0ffa79438430cc82f3aa6a194 ] 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 <linmq006@gmail.com> Reviewed-by: Juan Vazquez <juvazq@linux.microsoft.com> Link: https://lore.kernel.org/r/20220203173008.43480-1-linmq006@gmail.com Signed-off-by: Wei Liu <wei.liu@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/hv/vmbus_drv.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index 392c1ac4f819..44bd0b6ff505 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -2027,8 +2027,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);
@@ -2037,6 +2039,7 @@ int vmbus_add_channel_kobj(struct hv_device *dev, struct vmbus_channel *channel)
* The calling functions' error handling paths will cleanup the
* empty channel directory.
*/
+ kobject_put(kobj);
dev_err(device, "Unable to set up channel sysfs files\n");
return ret;
}