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 A8160C4332F for ; Mon, 13 Sep 2021 22:41:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 955DD60EFF for ; Mon, 13 Sep 2021 22:41:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349484AbhIMWmr (ORCPT ); Mon, 13 Sep 2021 18:42:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:55470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349136AbhIMWk2 (ORCPT ); Mon, 13 Sep 2021 18:40:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CFB6C61360; Mon, 13 Sep 2021 22:35:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631572558; bh=qmwpcNHmEWuMzPfSNlDTsweTD3lan5X1LDgDZlx7Zt4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nBIaQNXK33PvadoTP33Y61JvsXPCRCRPNPjHj0+LT/VO1FFetd4e/OgPqJHcOTTpe s8TZZgWZdMnPPB69EHXHG/1VSbZBTBHeZ+L7Nq3NQpiNusbgKFtR+KKZxGEQfTKER5 bdl3QRc9mOH4hWCA49RXDbENAXR0VC2fn3EAXjuQjaJwUrAzflavXoTQh+gdPcH7Xv Kbn8TwR8rnAiHkSqCynLEn4Uhyk5dOfLkPhbp8ehU0qA3p2G9TJs1YpXXLvScvkNkn ikZapF6HsiRnEoub8c6e16Y8kXXxZV8CZvW2xqe+Lh+Wp9scx01pSKerSa2evDdeDb 4egXrkzO21o3A== 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.9 7/9] nilfs2: fix memory leak in nilfs_sysfs_delete_##name##_group Date: Mon, 13 Sep 2021 18:35:47 -0400 Message-Id: <20210913223549.436541-7-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913223549.436541-1-sashal@kernel.org> References: <20210913223549.436541-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 eab7bd68da12..31eed118d0ce 100644 --- a/fs/nilfs2/sysfs.c +++ b/fs/nilfs2/sysfs.c @@ -106,7 +106,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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.9 7/9] nilfs2: fix memory leak in nilfs_sysfs_delete_##name##_group Date: Mon, 13 Sep 2021 18:35:47 -0400 Message-ID: <20210913223549.436541-7-sashal@kernel.org> References: <20210913223549.436541-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=1631572558; bh=qmwpcNHmEWuMzPfSNlDTsweTD3lan5X1LDgDZlx7Zt4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nBIaQNXK33PvadoTP33Y61JvsXPCRCRPNPjHj0+LT/VO1FFetd4e/OgPqJHcOTTpe s8TZZgWZdMnPPB69EHXHG/1VSbZBTBHeZ+L7Nq3NQpiNusbgKFtR+KKZxGEQfTKER5 bdl3QRc9mOH4hWCA49RXDbENAXR0VC2fn3EAXjuQjaJwUrAzflavXoTQh+gdPcH7Xv Kbn8TwR8rnAiHkSqCynLEn4Uhyk5dOfLkPhbp8ehU0qA3p2G9TJs1YpXXLvScvkNkn ikZapF6HsiRnEoub8c6e16Y8kXXxZV8CZvW2xqe+Lh+Wp9scx01pSKerSa2evDdeDb 4egXrkzO21o3A== In-Reply-To: <20210913223549.436541-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 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-hv44wF8Li93QT0dZR+AlfA@public.gmane.org Link: https://lkml.kernel.org/r/1625651306-10829-5-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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nilfs2/sysfs.c b/fs/nilfs2/sysfs.c index eab7bd68da12..31eed118d0ce 100644 --- a/fs/nilfs2/sysfs.c +++ b/fs/nilfs2/sysfs.c @@ -106,7 +106,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