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 783DCC433FE for ; Mon, 13 Sep 2021 22:38:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 61B8360E8B for ; Mon, 13 Sep 2021 22:38:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348753AbhIMWjh (ORCPT ); Mon, 13 Sep 2021 18:39:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:51456 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345583AbhIMWgt (ORCPT ); Mon, 13 Sep 2021 18:36:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 58C0161108; Mon, 13 Sep 2021 22:35:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631572502; bh=yeR0sBBYZBk2MG5AkY4jMRHn0KfkeEX2jI4zVJjnd54=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MptDnEDgvNLl1z+gKqa14qY69ioGD4PMJkObdYcoRDNI0+9xj3YZZz4/o8BCnhWwH ZRwC1z2HREGco8iqZlZ8hO/j0gK/J9KyCI8+2iTEVcYZhE1c7oOUoOe2S2bxwFdv3L V6wH6r+C96TB6TvvA/61PthIbFGwxWOOKrW7+J79PsLLWkl1/ZD/KV/i3XpvVmtAkd zO/F/ink9YTIAK2/4LaU/4glix8447fmzKM/acbKrD6uY/4NDX73wZ0RJfgNia/5nz zyEDXbpQFVucogFHcgK8vayhfrmLuTsouHbptbZKbieQPqxordCwFX09AcLiq3VtRJ WPsbfJKeCh7xg== 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.10 15/16] nilfs2: fix memory leak in nilfs_sysfs_create_snapshot_group Date: Mon, 13 Sep 2021 18:34:41 -0400 Message-Id: <20210913223442.435885-15-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913223442.435885-1-sashal@kernel.org> References: <20210913223442.435885-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 34893a57a7b9..44b9ad70a564 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