public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Miaoqian Lin <linmq006@gmail.com>
To: juvazq@linux.microsoft.com
Cc: decui@microsoft.com, gregkh@linuxfoundation.org,
	haiyangz@microsoft.com, kys@microsoft.com, linmq006@gmail.com,
	linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org,
	sthemmin@microsoft.com, wei.liu@kernel.org
Subject: [PATCH v2] Drivers: hv: vmbus: Fix memory leak in vmbus_add_channel_kobj
Date: Fri,  4 Feb 2022 01:30:08 +0800	[thread overview]
Message-ID: <20220203173008.43480-1-linmq006@gmail.com> (raw)
In-Reply-To: <20220128215604.xuqdpnnn4yjqfaoy@surface>

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>
---
Changes in v2:
- Add cleanup when sysfs_create_group() fails

kobject_uevent() is used for notifying userspace by sending an uevent,
I don't think we need to do error handling for it.
---
 drivers/hv/vmbus_drv.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index 17bf55fe3169..34a4fd21bdf5 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);
 
@@ -2038,6 +2040,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;
 	}
-- 
2.25.1


  parent reply	other threads:[~2022-02-03 17:30 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-26  5:52 [PATCH] Drivers: hv: vmbus: Fix memory leak in vmbus_add_channel_kobj Miaoqian Lin
2022-01-28 21:56 ` Juan Vazquez
2022-02-03 12:44   ` Wei Liu
2022-02-03 17:30   ` Miaoqian Lin [this message]
2022-02-06 14:55     ` [PATCH v2] " Juan Vazquez
2022-02-07 17:54       ` Wei Liu

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=20220203173008.43480-1-linmq006@gmail.com \
    --to=linmq006@gmail.com \
    --cc=decui@microsoft.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=haiyangz@microsoft.com \
    --cc=juvazq@linux.microsoft.com \
    --cc=kys@microsoft.com \
    --cc=linux-hyperv@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sthemmin@microsoft.com \
    --cc=wei.liu@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