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 D7FB8C433EF for ; Mon, 13 Sep 2021 22:39:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B734F60EFF for ; Mon, 13 Sep 2021 22:39:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348862AbhIMWka (ORCPT ); Mon, 13 Sep 2021 18:40:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:51156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348998AbhIMWhZ (ORCPT ); Mon, 13 Sep 2021 18:37:25 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EED4061284; Mon, 13 Sep 2021 22:35:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631572519; bh=EzL9KJn4SWgGVEjHbrIl82g6//S9PtBM8R84vzpgyao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PN8AIFjI66Iq7vZ+stKw42vgogD4Z4xKnjf03WIs+8xlHpdA8DYw9lJB+K1emeZyD W/R1q5ohX9vzZrK/fKbvspazkri8A75b4S4T45mU/faYkhj58f9P29ao7kyjjGKETr 0tGcLLNILNOumH2vOi+eLdOVFCGdxQmZd8k2cjlIYcwTaMzq49KGc4BZb8mkN9SAA2 /6OoaC/84qNL5gbazEDBAYAgeSdtTBOs2RZKNSCnKZzZdZclslERfk2THihol2XyWC GrAz51oyeubMDsOmmRmoCaZvlQlwk1+lCAwOSmeAdJic9kZBjt30/ktogStJ/16vAx JrudTH16EovoA== 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 5.4 11/12] nilfs2: fix memory leak in nilfs_sysfs_create_snapshot_group Date: Mon, 13 Sep 2021 18:35:03 -0400 Message-Id: <20210913223504.436087-11-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913223504.436087-1-sashal@kernel.org> References: <20210913223504.436087-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