From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27430C433EF for ; Mon, 13 Sep 2021 22:39:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0EA8360EFF for ; Mon, 13 Sep 2021 22:39:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349533AbhIMWlG (ORCPT ); Mon, 13 Sep 2021 18:41:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:51474 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348680AbhIMWia (ORCPT ); Mon, 13 Sep 2021 18:38:30 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D3121610F9; Mon, 13 Sep 2021 22:35:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631572533; bh=EzL9KJn4SWgGVEjHbrIl82g6//S9PtBM8R84vzpgyao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Br+XiIkG9F8aFYK7W7xWlIUtdlxpFvcUp/wwHoFhN8tCRvMSlo4rqNhpTDCB9LWf2 KO6Gs0WDjZ1630aMlAV81F63SkKloI05YtPaQVfLv5pEWGfZ5LaeJzUOcVLq4NQC1u pc5OvvTjPS1/JKmz1rCiKJzAEB3QZUirJWGzpHkPisusEOo0m+Qy3qdVgztHWG0Bi3 b7pDTvE6X3FxzeDDY6370dypLC72pnWuBlitt0Wx3Ex0xDPIuWXsBFcE/QktOzTC9X P95PFIIg9NA1gI/+EO7nzCeTuz5tQdHyNR/vhmV1smH5U8qxKFxCWLtaCsyAb6lDxI JkLpfOBYWFcXw== From: Sasha Levin 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 Subject: [PATCH AUTOSEL 4.19 09/10] nilfs2: fix memory leak in nilfs_sysfs_create_snapshot_group Date: Mon, 13 Sep 2021 18:35:20 -0400 Message-Id: <20210913223521.436250-9-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913223521.436250-1-sashal@kernel.org> References: <20210913223521.436250-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 195f42192a15..6c92ac314b06 100644 --- a/fs/nilfs2/sysfs.c +++ b/fs/nilfs2/sysfs.c @@ -208,9 +208,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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 09/10] nilfs2: fix memory leak in nilfs_sysfs_create_snapshot_group Date: Mon, 13 Sep 2021 18:35:20 -0400 Message-ID: <20210913223521.436250-9-sashal@kernel.org> References: <20210913223521.436250-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=1631572533; bh=EzL9KJn4SWgGVEjHbrIl82g6//S9PtBM8R84vzpgyao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Br+XiIkG9F8aFYK7W7xWlIUtdlxpFvcUp/wwHoFhN8tCRvMSlo4rqNhpTDCB9LWf2 KO6Gs0WDjZ1630aMlAV81F63SkKloI05YtPaQVfLv5pEWGfZ5LaeJzUOcVLq4NQC1u pc5OvvTjPS1/JKmz1rCiKJzAEB3QZUirJWGzpHkPisusEOo0m+Qy3qdVgztHWG0Bi3 b7pDTvE6X3FxzeDDY6370dypLC72pnWuBlitt0Wx3Ex0xDPIuWXsBFcE/QktOzTC9X P95PFIIg9NA1gI/+EO7nzCeTuz5tQdHyNR/vhmV1smH5U8qxKFxCWLtaCsyAb6lDxI JkLpfOBYWFcXw== In-Reply-To: <20210913223521.436250-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 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-hv44wF8Li93QT0dZR+AlfA@public.gmane.org Link: https://lkml.kernel.org/r/1625651306-10829-6-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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nilfs2/sysfs.c b/fs/nilfs2/sysfs.c index 195f42192a15..6c92ac314b06 100644 --- a/fs/nilfs2/sysfs.c +++ b/fs/nilfs2/sysfs.c @@ -208,9 +208,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