From: Nanyong Sun <sunnanyong@huawei.com>
To: <konishi.ryusuke@gmail.com>
Cc: <linux-nilfs@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<sunnanyong@huawei.com>, <wangkefeng.wang@huawei.com>
Subject: [PATCH 5/6] nilfs2: fix memory leak in nilfs_sysfs_create_snapshot_group
Date: Tue, 29 Jun 2021 10:25:55 +0800 [thread overview]
Message-ID: <20210629022556.3985106-6-sunnanyong@huawei.com> (raw)
In-Reply-To: <20210629022556.3985106-1-sunnanyong@huawei.com>
If kobject_init_and_add returns with error, kobject_put() is needed
here to avoid memory leak, because kobject_init_and_add may return
error without freeing the memory associated with the kobject it allocated.
Signed-off-by: Nanyong Sun <sunnanyong@huawei.com>
---
fs/nilfs2/sysfs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/nilfs2/sysfs.c b/fs/nilfs2/sysfs.c
index d989e6500bd7..5ba87573ad3b 100644
--- a/fs/nilfs2/sysfs.c
+++ b/fs/nilfs2/sysfs.c
@@ -195,9 +195,9 @@ int nilfs_sysfs_create_snapshot_group(struct nilfs_root *root)
}
if (err)
- return err;
+ kobject_put(&root->snapshot_kobj);
- return 0;
+ return err;
}
void nilfs_sysfs_delete_snapshot_group(struct nilfs_root *root)
--
2.18.0.huawei.25
next prev parent reply other threads:[~2021-06-29 1:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-29 2:25 [PATCH 0/6] nilfs2: fix incorrect usage of kobject Nanyong Sun
2021-06-29 2:25 ` [PATCH 1/6] nilfs2: fix memory leak in nilfs_sysfs_create_device_group Nanyong Sun
2021-06-29 2:25 ` [PATCH 2/6] nilfs2: fix NULL pointer in nilfs_##name##_attr_release Nanyong Sun
2021-06-29 2:25 ` [PATCH 3/6] nilfs2: fix memory leak in nilfs_sysfs_create_##name##_group Nanyong Sun
2021-06-29 2:25 ` [PATCH 4/6] nilfs2: fix memory leak in nilfs_sysfs_delete_##name##_group Nanyong Sun
2021-06-29 2:25 ` Nanyong Sun [this message]
2021-06-29 2:25 ` [PATCH 6/6] nilfs2: fix memory leak in nilfs_sysfs_delete_snapshot_group Nanyong Sun
2021-07-01 13:00 ` [PATCH 0/6] nilfs2: fix incorrect usage of kobject Ryusuke Konishi
2021-07-07 9:48 Ryusuke Konishi
2021-07-07 9:48 ` [PATCH 5/6] nilfs2: fix memory leak in nilfs_sysfs_create_snapshot_group Ryusuke Konishi
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=20210629022556.3985106-6-sunnanyong@huawei.com \
--to=sunnanyong@huawei.com \
--cc=konishi.ryusuke@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nilfs@vger.kernel.org \
--cc=wangkefeng.wang@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).