[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1279836546-26913-6-git-send-email-ppannuto@codeaurora.org>
Date: Thu, 22 Jul 2010 15:09:05 -0700
From: Patrick Pannuto <ppannuto@...eaurora.org>
To: linux-kernel@...r.kernel.org
Cc: ppannuto@...eaurora.org, Mark Fasheh <mfasheh@...e.com>,
Joel Becker <joel.becker@...cle.com>,
Stephen Hemminger <shemminger@...tta.com>,
Jens Axboe <jens.axboe@...cle.com>,
David Teigland <teigland@...hat.com>,
Pekka Enberg <penberg@...helsinki.fi>,
ocfs2-devel@....oracle.com
Subject: [PATCH 5/6] ocfs2: Fix memory leak on mlog_sys_init error path
This leak is the same as the bus path; mlog_kset.kobj.name is
set, but kset_register fails, thus nothing will ever call
kset_unregister and name will be leaked
Signed-off-by: Patrick Pannuto <ppannuto@...eaurora.org>
---
fs/ocfs2/cluster/masklog.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c
index c7fba39..de715d4 100644
--- a/fs/ocfs2/cluster/masklog.c
+++ b/fs/ocfs2/cluster/masklog.c
@@ -154,6 +154,7 @@ static struct kset mlog_kset = {
int mlog_sys_init(struct kset *o2cb_kset)
{
int i = 0;
+ int ret;
while (mlog_attrs[i].attr.mode) {
mlog_attr_ptrs[i] = &mlog_attrs[i].attr;
@@ -163,7 +164,11 @@ int mlog_sys_init(struct kset *o2cb_kset)
kobject_set_name(&mlog_kset.kobj, "logmask");
mlog_kset.kobj.kset = o2cb_kset;
- return kset_register(&mlog_kset);
+
+ ret = kset_register(&mlog_kset);
+ if (ret)
+ kfree(mlog_kset.kobj.name);
+ return ret;
}
void mlog_sys_shutdown(void)
--
1.7.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists