From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.9 8/9] nilfs2: fix memory leak in nilfs_sysfs_create_snapshot_group Date: Mon, 13 Sep 2021 18:35:48 -0400 Message-ID: <20210913223549.436541-8-sashal@kernel.org> References: <20210913223549.436541-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=1631572559; bh=DTLkUcX8uZmbCVP4ckZc+XfsJHIBYPUK8tiOu761O4E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DbGOrCMmmNetvR17PPPRnT+dvGIIwnJHUHFAIeq1Ut6TYSNMbffVreXzWn7fq7IQa gWyzxMDqAJ+0bG774hjbzT6Ws+i72MAJ4hWCeYR877xFm4vUCsBDiDsgrtTp2h6VPn 3jW27afqnRL7gWvxVNuBimBMfqYJMWA/4E4lKU334mCfulhtW3MfgzEHDu/HgJtmdv RsIoqpHGsilhE9/TKHne/PRsbL3ctky6wecYHatyio9HkcuP8DerRanDWc0T6LtNwN z6nS/2JyBBp+ucuXPZsWzBwVw1kAWVkXKAX7nx0coMs7kJ7ca0aXh3m9KYbAF8WT34 YFJSKgXk9KvQA== In-Reply-To: <20210913223549.436541-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 b2fe39c248f3fa4bbb2a20759b4fdd83504190f7 ] 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. Link: https://lkml.kernel.org/r/20210629022556.3985106-6-sunnanyong@huawei.com Link: https://lkml.kernel.org/r/1625651306-10829-6-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 31eed118d0ce..28f5572c6aae 100644 --- a/fs/nilfs2/sysfs.c +++ b/fs/nilfs2/sysfs.c @@ -217,9 +217,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.30.2