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 9403FC433EF for ; Mon, 13 Sep 2021 22:41:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7D7FE61108 for ; Mon, 13 Sep 2021 22:41:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348812AbhIMWmQ (ORCPT ); Mon, 13 Sep 2021 18:42:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:50872 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349385AbhIMWj2 (ORCPT ); Mon, 13 Sep 2021 18:39:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B64B061216; Mon, 13 Sep 2021 22:35:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631572548; bh=z3fD1eXLu52vtiK1cOfP6pjzNLL6Ku0x60Rfm6bw5pA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R2OQc21lqC3f01U0uCc6Q6Gbzzzw1VurRPIYCZxBv37cz8LVgb7EVT31Q07m6U1lY jYeRYdTdCSyiOjs5Wqe2MSvx8eb59G3y7hFx2djFP6Ru2zRs0bkAlQa7sWOw153IXb OiiUag9CTI7dRiHT2Fmm1IqEpzhK8XLRQ8X7skTQEuVee/pHf88+MLxqDNn6T7b3ot AXIw0ZEmHd1QkFLfTV9luKcQkZhv0lS5BuVfn3AOyExd7c18ul55eSxKOKNwzZQfG9 DMeAo6KYN2eyXnefUs6YoYU/V0QQHC9hC+9vLQALW2vtjy+F5wf5cKmWHRCiaR1Tvz 8cCgiOOIkJf9w== 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.14 9/9] nilfs2: fix memory leak in nilfs_sysfs_delete_snapshot_group Date: Mon, 13 Sep 2021 18:35:35 -0400 Message-Id: <20210913223535.436405-9-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913223535.436405-1-sashal@kernel.org> References: <20210913223535.436405-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 17243e1c3072b8417a5ebfc53065d0a87af7ca77 ] kobject_put() should be used to cleanup the memory associated with the kobject instead of kobject_del(). See the section "Kobject removal" of "Documentation/core-api/kobject.rst". Link: https://lkml.kernel.org/r/20210629022556.3985106-7-sunnanyong@huawei.com Link: https://lkml.kernel.org/r/1625651306-10829-7-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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nilfs2/sysfs.c b/fs/nilfs2/sysfs.c index 28f5572c6aae..33fba75aa9f3 100644 --- a/fs/nilfs2/sysfs.c +++ b/fs/nilfs2/sysfs.c @@ -224,7 +224,7 @@ int nilfs_sysfs_create_snapshot_group(struct nilfs_root *root) void nilfs_sysfs_delete_snapshot_group(struct nilfs_root *root) { - kobject_del(&root->snapshot_kobj); + kobject_put(&root->snapshot_kobj); } /************************************************************************ -- 2.30.2