From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.10 13/16] nilfs2: fix memory leak in nilfs_sysfs_create_##name##_group Date: Mon, 13 Sep 2021 18:34:39 -0400 Message-ID: <20210913223442.435885-13-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=1631572499; bh=JJxAlnMO1RtxGCmp4Tk/rVED7CmQ4t0m16eubjcGGEk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NSIxIAvEdTqEGcHqKvQZPdoowaLZI/xKeUio0VLutqa4jhorx25KZUA7WHVEzC6gF UwxpaQ4RNGjBR8HjUY6+P4I9V+YPut8Fk1CQOgdvICnEGxRpCidACQsfy1v43w8qrY QvNqXCGT5l2wGmr8oFzh4S1G6FEo9WhaNWasykfT1caCwYDH4qDpItEO3zZRcnOr44 ObdpPnVXpNcfiufTTgieHGSMc9nGKuwmG7DSfGByQ6OFC/MrTPU7nC9ZHrNzcWEOnA awC1BytW+1shuMltweYIhH0fNrCpjFjso2ChilWHyu6vP5viiJ0Vp8zlZMwrs0Ey+z dxu6ZcF849bOA== In-Reply-To: <20210913223442.435885-1-sashal@kernel.org> List-ID: Content-Type: text/plain; charset="us-ascii" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nanyong Sun , Ryusuke Konishi , Andrew Morton , Linus Torvalds , Sasha Levin , linux-nilfs@vger.kernel.org From: Nanyong Sun [ Upstream commit 24f8cb1ed057c840728167dab33b32e44147c86f ] If kobject_init_and_add return 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. Link: https://lkml.kernel.org/r/20210629022556.3985106-4-sunnanyong@huawei.com Link: https://lkml.kernel.org/r/1625651306-10829-4-git-send-email-konishi.ryusuke@gmail.com 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nilfs2/sysfs.c b/fs/nilfs2/sysfs.c index 43f660beb9b4..5dc468ff5903 100644 --- a/fs/nilfs2/sysfs.c +++ b/fs/nilfs2/sysfs.c @@ -92,8 +92,8 @@ static int nilfs_sysfs_create_##name##_group(struct the_nilfs *nilfs) \ err = kobject_init_and_add(kobj, &nilfs_##name##_ktype, parent, \ #name); \ if (err) \ - return err; \ - return 0; \ + kobject_put(kobj); \ + return err; \ } \ static void nilfs_sysfs_delete_##name##_group(struct the_nilfs *nilfs) \ { \ -- 2.30.2