From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.14 24/25] nilfs2: fix memory leak in nilfs_sysfs_create_snapshot_group Date: Mon, 13 Sep 2021 18:33:38 -0400 Message-ID: <20210913223339.435347-24-sashal@kernel.org> References: <20210913223339.435347-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=1631572453; bh=TDaHTmqcbss69zhpQDDmrrnzg7Hbovyj4l1y4txwaIs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pWhK6rnW7hb2JxoVdsNHrRXqGrZJXJ1R9S8Eu2NJh58qXFn4avfJWME7hsTijU1do XYUPfDSIcZEfVssZ3SFJ7jbjmWlxgUtm6W6rrEornur6qnnz6KD3V9eBCwMhC7G6lp o99cvDp+JLz98VsoXkbvoklyugFXI7XKyl/ZNv3XB/hBcDOn4iuRehVheu43uIlmgs 45mXz9TYvYx51kBLNo83e15Zk9i96xdUksMwUXEoAIDfaVrUGsnhrtuA+bRaZRMGIH 4FHHYw8DoMPggUAZ04HCjTF0mweiaN3qkHv8Ck4cB8sxB2hetABcd9xzdN++Z8K6IS vg3b2WF9PRrRg== In-Reply-To: <20210913223339.435347-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 d989e6500bd7..5ba87573ad3b 100644 --- a/fs/nilfs2/sysfs.c +++ b/fs/nilfs2/sysfs.c @@ -195,9 +195,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