From: Tobin C. Harding Date: Mon, 13 May 2019 13:32:13 +1000 Subject: [Cluster-devel] [PATCH] gfs2: Fix error path kobject memory leak Message-ID: <20190513033213.2468-1-tobin@kernel.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit If a call to kobject_init_and_add() fails we must call kobject_put() otherwise we leak memory. Function always calls kobject_init_and_add() which always calls kobject_init(). It is safe to leave object destruction up to the kobject release function and never free it manually. Remove call to kfree() and always call kobject_put() in the error path. Signed-off-by: Tobin C. Harding --- Is it ok to send patches during the merge window? Applies on top of Linus' mainline tag: v5.1 Happy to rebase if there are conflicts. thanks, Tobin. fs/gfs2/sys.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c index 1787d295834e..98586b139386 100644 --- a/fs/gfs2/sys.c +++ b/fs/gfs2/sys.c @@ -661,8 +661,6 @@ int gfs2_sys_fs_add(struct gfs2_sbd *sdp) if (error) goto fail_reg; - sysfs_frees_sdp = 1; /* Freeing sdp is now done by sysfs calling - function gfs2_sbd_release. */ error = sysfs_create_group(&sdp->sd_kobj, &tune_group); if (error) goto fail_reg; @@ -687,10 +685,7 @@ int gfs2_sys_fs_add(struct gfs2_sbd *sdp) fail_reg: free_percpu(sdp->sd_lkstats); fs_err(sdp, "error %d adding sysfs files\n", error); - if (sysfs_frees_sdp) - kobject_put(&sdp->sd_kobj); - else - kfree(sdp); + kobject_put(&sdp->sd_kobj); sb->s_fs_info = NULL; return error; } -- 2.21.0