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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 441F9C3601E for ; Fri, 4 Apr 2025 07:46:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B5AE7280004; Fri, 4 Apr 2025 03:46:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AB3BA280001; Fri, 4 Apr 2025 03:46:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8DED2280004; Fri, 4 Apr 2025 03:46:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 71105280001 for ; Fri, 4 Apr 2025 03:46:38 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 4564AC24AA for ; Fri, 4 Apr 2025 07:46:39 +0000 (UTC) X-FDA: 83295579318.15.032994B Received: from invmail4.hynix.com (exvmail4.hynix.com [166.125.252.92]) by imf19.hostedemail.com (Postfix) with ESMTP id 474EE1A0003 for ; Fri, 4 Apr 2025 07:46:37 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf19.hostedemail.com: domain of rakie.kim@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=rakie.kim@sk.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743752797; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5W1GBOOfUtgXX2/F43cSKnAPzgNnJsmu+qpzKa2S1Is=; b=3ixuNhnO0gKTvS/Mx7ud+bdFQuNBBHTM5QxqgtfMArWfDiTFVlvsKK4IoklTE5Zjs11+84 dc2mkuvQlP4vQmLYYzmGObVv2VN2DOZ7CTVgpkU7NwGxeaAO4Oc42wQDthTrCKnpMTQEAw C1m+XAtXW9NCTiwR8UvIrlAnrOwbP5I= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf19.hostedemail.com: domain of rakie.kim@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=rakie.kim@sk.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743752797; a=rsa-sha256; cv=none; b=GTNdN2gYm8O1A6itb2rJVbZDPc7NDNZP2yIDL4Di+zBDpeLRSIpVdwXBFg2lM19mzhEFyU bc9eOgXRI+cwBPr+0gOXaI4/6oZOmSVr+Pa5EyLlfAepnyppetn9cbkQvjRl4A57j73n3w VQKnoenUAZMo72PDYNNXGjpkRZPDoWQ= X-AuditID: a67dfc5b-681ff7000002311f-ca-67ef8e5a4971 From: Rakie Kim To: akpm@linux-foundation.org Cc: gourry@gourry.net, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-cxl@vger.kernel.org, joshua.hahnjy@gmail.com, dan.j.williams@intel.com, ying.huang@linux.alibaba.com, david@redhat.com, Jonathan.Cameron@huawei.com, osalvador@suse.de, kernel_team@skhynix.com, honggyu.kim@sk.com, yunjeong.mun@sk.com, rakie.kim@sk.com Subject: [PATCH v6 1/3] mm/mempolicy: Fix memory leaks in weighted interleave sysfs Date: Fri, 4 Apr 2025 16:46:19 +0900 Message-ID: <20250404074623.1179-2-rakie.kim@sk.com> X-Mailer: git-send-email 2.48.1.windows.1 In-Reply-To: <20250404074623.1179-1-rakie.kim@sk.com> References: <20250404074623.1179-1-rakie.kim@sk.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBLMWRmVeSWpSXmKPExsXC9ZZnoW5U3/t0gzeLJC3mrF/DZjF96gVG i6/rfzFb/Lx7nN1i1cJrbBbHt85jtzg/6xSLxeVdc9gs7q35z2pxZlqRxeo1GQ7cHjtn3WX3 6G67zO7RcuQtq8fiPS+ZPDZ9msTucWLGbxaPnQ8tPd7vu8rmsfl0tcfnTXIBXFFcNimpOZll qUX6dglcGWcfTmIvOCZX0bPqCnsD41uJLkYODgkBE4ltP2W7GDnBzCWP2llAwmwCShLH9saA hEUEZCWm/j0PFObiYBZ4zCTx6PkLRpCEsECwxMQzW9lBbBYBVYnlr9rAbF6gOQ1LnjBDzNSU aLh0jwnE5hQwlfj98CSYLQRUs/rpEah6QYmTM5+wgNjMAvISzVtnM4MskxD4zCbxavZMJohB khIHV9xgmcDIPwtJzywkPQsYmVYxCmXmleUmZuaY6GVU5mVW6CXn525iBIb/sto/0TsYP10I PsQowMGoxMNrUfguXYg1say4MvcQowQHs5II792c9+lCvCmJlVWpRfnxRaU5qcWHGKU5WJTE eY2+lacICaQnlqRmp6YWpBbBZJk4OKUaGJfFpzHrlL/5XPjLg2FBttdtj8+in854z9resq7u yfO+Eyl2YjLXVx1+EDo1M61A8N6l399D5iszThAUuLKT8W5tkUOU7VbWw/tNmMx3Jtg5fOfU dj8q/8a82jt53eYm7k2Te3bqHb6bsnfVk/qphiIBXw8ZnDDf/+mcX2zFzgP67Fey3sq0rFZi Kc5INNRiLipOBACIZu2NewIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRmVeSWpSXmKPExsXCNUNNSzeq7326wdP3XBZz1q9hs5g+9QKj xdf1v5gtft49zm7x+dlrZotVC6+xWRzfOo/d4vDck6wW52edYrG4vGsOm8W9Nf9ZLc5MK7I4 dO05q8XqNRkWv7etYHPg99g56y67R3fbZXaPliNvWT0W73nJ5LHp0yR2jxMzfrN47Hxo6fF+ 31U2j2+3PTwWv/jA5LH5dLXH501yATxRXDYpqTmZZalF+nYJXBlnH05iLzgmV9Gz6gp7A+Nb iS5GTg4JAROJJY/aWboYOTjYBJQkju2NAQmLCMhKTP17HijMxcEs8JhJ4tHzF4wgCWGBYImJ Z7ayg9gsAqoSy1+1gdm8QHMaljxhhpipKdFw6R4TiM0pYCrx++FJMFsIqGb10yNQ9YISJ2c+ YQGxmQXkJZq3zmaewMgzC0lqFpLUAkamVYwimXlluYmZOaZ6xdkZlXmZFXrJ+bmbGIFBv6z2 z8QdjF8uux9iFOBgVOLhtSh8ly7EmlhWXJl7iFGCg1lJhPduzvt0Id6UxMqq1KL8+KLSnNTi Q4zSHCxK4rxe4akJQgLpiSWp2ampBalFMFkmDk6pBsYGz8fOkRFqhrbsZqyBjQHpwbcMOkMW fs+wM1iUfa7Wx/71+R92+8oKNq+dXvPEteHpkZZ9zxbsWRr9+I9FdaTBy6xfh/2PSkQd7W05 defM1Tn5+z5Lpv0tWOL6K63kl9CJafclU7q2acmdeTv/xQ89l7nv5Ri2eZSXTSw8ZGRzVVD6 cu7aKaFKLMUZiYZazEXFiQDHMuWxdgIAAA== X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 474EE1A0003 X-Rspamd-Server: rspam05 X-Rspam-User: X-Stat-Signature: jbx8apzc9yqfyhaw7h9qpxshzh1wzsg1 X-HE-Tag: 1743752797-444172 X-HE-Meta: U2FsdGVkX1/+3zzfpTZos0V33AL2Z+rA+Soq4XHUqhk5kcJBbATdi8dE5xaxqnascd6kA/Rp50JI1CWofWi8F/XD2zjbsdJBzpTLhA23/sFmZYkLQqDSXUMdllr90M9gqIKkCb/7na3Nt/M4eiqRlPMbVOC9vOv4TxRSqTMWwXFc8y0cYSN9t+xZaHu1FFA8bkOSkhcox7e4uq1fCYnuQnqDWYF4wb5QgUMQQhPqVku+tVRBIZzz+jZnqck3OIhmN3Y8DjGNvABFK2MBKu7X2h+Fs/dBkrsLR8Y7ydlazOTU/mGzEpdgVMubsoctaxY7Tiox+H6gDAxj1RUs4qLlopukyuhiUN4/ugvtr3mX1jyNE51T4N+yDCGiRpqNle+Upv/1XdIsCprAecPv8//Sr5glQeQ2YTm4Y2FRbCr1ephS7ohVaA5h13YCWR7SXsC0b5y4cYpxUQng6WElX598BbDAS9EcFPOvnFZy3TGNlY8vSLE1ucrop8eYTmS2HW3F0t1H9ooTCBQv5FOKyn2y+CKHielzLMsM/FfheD44Jw0IjOhKn6yMD5QMxi7AhJ5B78cwgK6dXMfkFbzvRQ/mV+d/fEE1yu4DjxNU1kgJ8yplCzcU+KpcYw0TcbXhMwMoHkwbyP/BSHmZypVs9ZEl4nhOOeB9sv+/2al93QNhfr83AWtq8Mwo0cnd0a+uaS1cVD5FTcCey8TUuRAxhqDWZ+yMicYYCgILlHkSH/FGvLwPwyAqD3aPNZ0OEZy6bBXv2fO59gYQlneaPzvT2V4pMyk+DH0LNBi8sF0kX/joCfncU64I3faIROfS5HcLyMS7/xwbgjnXIrJm26WjuS/dJzn8DyuXHG3+1YVdjmdBbQUCyTAuozw62f9yydcxief4+AUh1xw6/77D7Nl0mVX1S8zSZ9c5ji0h+K9pVo3NpaV0CaReZIKj5iETknTKdkKAQcnzYzaw+E3RZbS/WDc hntt+ugk g9m7kdAaIMvmx0nRF0umepVazi4FlQxXat+QmfV0Z7HNQxn00URJUUaVWEUNL/9UgXWYc3aQOVd4bhNI9nBKkB+SIyhg0WgtW4bFhpcrmjmDqrcPr8VI2VY/TsxRRSGhR2qFZPV3A4wTSv2G8Bm58BIh2YoE5mdBiG7XK X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Memory leaks occurred when removing sysfs attributes for weighted interleave. Improper kobject deallocation led to unreleased memory when initialization failed or when nodes were removed. This patch resolves the issue by replacing unnecessary `kfree()` calls with proper `kobject_del()` and `kobject_put()` sequences, ensuring correct teardown and preventing memory leaks. By explicitly calling `kobject_del()` before `kobject_put()`, the release function is now invoked safely, and internal sysfs state is correctly cleaned up. This guarantees that the memory associated with the kobject is fully released and avoids resource leaks, thereby improving system stability. Fixes: dce41f5ae253 ("mm/mempolicy: implement the sysfs-based weighted_interleave interface") Signed-off-by: Rakie Kim Signed-off-by: Honggyu Kim Signed-off-by: Yunjeong Mun Reviewed-by: Gregory Price --- mm/mempolicy.c | 64 +++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index bbaadbeeb291..af3753925573 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -3448,7 +3448,9 @@ static void sysfs_wi_release(struct kobject *wi_kobj) for (i = 0; i < nr_node_ids; i++) sysfs_wi_node_release(node_attrs[i], wi_kobj); - kobject_put(wi_kobj); + + kfree(node_attrs); + kfree(wi_kobj); } static const struct kobj_type wi_ktype = { @@ -3494,15 +3496,22 @@ static int add_weighted_interleave_group(struct kobject *root_kobj) struct kobject *wi_kobj; int nid, err; - wi_kobj = kzalloc(sizeof(struct kobject), GFP_KERNEL); - if (!wi_kobj) + node_attrs = kcalloc(nr_node_ids, sizeof(struct iw_node_attr *), + GFP_KERNEL); + if (!node_attrs) return -ENOMEM; + wi_kobj = kzalloc(sizeof(struct kobject), GFP_KERNEL); + if (!wi_kobj) { + err = -ENOMEM; + goto node_out; + } + err = kobject_init_and_add(wi_kobj, &wi_ktype, root_kobj, "weighted_interleave"); if (err) { - kfree(wi_kobj); - return err; + kobject_put(wi_kobj); + goto err_out; } for_each_node_state(nid, N_POSSIBLE) { @@ -3512,9 +3521,18 @@ static int add_weighted_interleave_group(struct kobject *root_kobj) break; } } - if (err) + if (err) { + kobject_del(wi_kobj); kobject_put(wi_kobj); + goto err_out; + } + return 0; + +node_out: + kfree(node_attrs); +err_out: + return err; } static void mempolicy_kobj_release(struct kobject *kobj) @@ -3528,7 +3546,6 @@ static void mempolicy_kobj_release(struct kobject *kobj) mutex_unlock(&iw_table_lock); synchronize_rcu(); kfree(old); - kfree(node_attrs); kfree(kobj); } @@ -3542,37 +3559,24 @@ static int __init mempolicy_sysfs_init(void) static struct kobject *mempolicy_kobj; mempolicy_kobj = kzalloc(sizeof(*mempolicy_kobj), GFP_KERNEL); - if (!mempolicy_kobj) { - err = -ENOMEM; - goto err_out; - } - - node_attrs = kcalloc(nr_node_ids, sizeof(struct iw_node_attr *), - GFP_KERNEL); - if (!node_attrs) { - err = -ENOMEM; - goto mempol_out; - } + if (!mempolicy_kobj) + return -ENOMEM; err = kobject_init_and_add(mempolicy_kobj, &mempolicy_ktype, mm_kobj, "mempolicy"); if (err) - goto node_out; + goto err_out; err = add_weighted_interleave_group(mempolicy_kobj); - if (err) { - pr_err("mempolicy sysfs structure failed to initialize\n"); - kobject_put(mempolicy_kobj); - return err; - } + if (err) + goto err_del; - return err; -node_out: - kfree(node_attrs); -mempol_out: - kfree(mempolicy_kobj); + return 0; + +err_del: + kobject_del(mempolicy_kobj); err_out: - pr_err("failed to add mempolicy kobject to the system\n"); + kobject_put(mempolicy_kobj); return err; } -- 2.34.1