From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.10 14/16] nilfs2: fix memory leak in nilfs_sysfs_delete_##name##_group Date: Mon, 13 Sep 2021 18:34:40 -0400 Message-ID: <20210913223442.435885-14-sashal@kernel.org> References: <20210913223442.435885-1-sashal@kernel.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631572500; bh=0Cen5K5IF/Cncx+iVxmo4t1mkkbSP0w1GtgckFBON20=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QfScuShq5Z706M4r4AqmGN5PqOfz5C1vBa/qisRy1nGV5Js+E4eZ8lnpEjbt1LHOP g6vS0JIpfPl7eubcNb1cxZvPldIWkVTcBo41fR1W2ouvF1bu5K0SDKU3ToKf9+p1Hp v0Ws+K7wcl/YLjf9KB+eczTGia16wG8d7JuDmkq3gEgcFmgpw2WE4UShmf3aR+dYtp q6tUImic5ZjEPQYj3Yu7qPO3dXigJ3sf+rnkNPHubThAdBC0dTAWWsLerySEGSEDxb fzszdarhnWb0bKfq4iimVq3oOliMUXVJa2+DPm4yTLVENrSCABNCPp8dnLokvzJMbY m5MsbfnlTBg2A== In-Reply-To: <20210913223442.435885-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-ID: Content-Type: text/plain; charset="us-ascii" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Nanyong Sun , Ryusuke Konishi , Andrew Morton , Linus Torvalds , Sasha Levin , linux-nilfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org From: Nanyong Sun [ Upstream commit a3e181259ddd61fd378390977a1e4e2316853afa ] The kobject_put() should be used to cleanup the memory associated with the kobject instead of kobject_del. See the section "Kobject removal" of "Documentation/core-api/kobject.rst". Link: https://lkml.kernel.org/r/20210629022556.3985106-5-sunnanyong-hv44wF8Li93QT0dZR+AlfA@public.gmane.org Link: https://lkml.kernel.org/r/1625651306-10829-5-git-send-email-konishi.ryusuke-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Signed-off-by: Nanyong Sun Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- fs/nilfs2/sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nilfs2/sysfs.c b/fs/nilfs2/sysfs.c index 5dc468ff5903..34893a57a7b9 100644 --- a/fs/nilfs2/sysfs.c +++ b/fs/nilfs2/sysfs.c @@ -97,7 +97,7 @@ static int nilfs_sysfs_create_##name##_group(struct the_nilfs *nilfs) \ } \ static void nilfs_sysfs_delete_##name##_group(struct the_nilfs *nilfs) \ { \ - kobject_del(&nilfs->ns_##parent_name##_subgroups->sg_##name##_kobj); \ + kobject_put(&nilfs->ns_##parent_name##_subgroups->sg_##name##_kobj); \ } /************************************************************************ -- 2.30.2