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 82526C433EF for ; Mon, 13 Sep 2021 22:38:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 661BD60E8B for ; Mon, 13 Sep 2021 22:38:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243944AbhIMWje (ORCPT ); Mon, 13 Sep 2021 18:39:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:50674 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348401AbhIMWgt (ORCPT ); Mon, 13 Sep 2021 18:36:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CC00B61263; Mon, 13 Sep 2021 22:34:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631572500; bh=0Cen5K5IF/Cncx+iVxmo4t1mkkbSP0w1GtgckFBON20=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QfScuShq5Z706M4r4AqmGN5PqOfz5C1vBa/qisRy1nGV5Js+E4eZ8lnpEjbt1LHOP g6vS0JIpfPl7eubcNb1cxZvPldIWkVTcBo41fR1W2ouvF1bu5K0SDKU3ToKf9+p1Hp v0Ws+K7wcl/YLjf9KB+eczTGia16wG8d7JuDmkq3gEgcFmgpw2WE4UShmf3aR+dYtp q6tUImic5ZjEPQYj3Yu7qPO3dXigJ3sf+rnkNPHubThAdBC0dTAWWsLerySEGSEDxb fzszdarhnWb0bKfq4iimVq3oOliMUXVJa2+DPm4yTLVENrSCABNCPp8dnLokvzJMbY m5MsbfnlTBg2A== 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 14/16] nilfs2: fix memory leak in nilfs_sysfs_delete_##name##_group Date: Mon, 13 Sep 2021 18:34:40 -0400 Message-Id: <20210913223442.435885-14-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 a3e181259ddd61fd378390977a1e4e2316853afa ] The 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-5-sunnanyong@huawei.com Link: https://lkml.kernel.org/r/1625651306-10829-5-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 5dc468ff5903..34893a57a7b9 100644 --- a/fs/nilfs2/sysfs.c +++ b/fs/nilfs2/sysfs.c @@ -97,7 +97,7 @@ static int nilfs_sysfs_create_##name##_group(struct the_nilfs *nilfs) \ } \ static void nilfs_sysfs_delete_##name##_group(struct the_nilfs *nilfs) \ { \ - kobject_del(&nilfs->ns_##parent_name##_subgroups->sg_##name##_kobj); \ + kobject_put(&nilfs->ns_##parent_name##_subgroups->sg_##name##_kobj); \ } /************************************************************************ -- 2.30.2