Commit 01088a60 authored by Miaohe Lin's avatar Miaohe Lin Committed by Andrew Morton
Browse files

mm/hugetlb: fix sysfs group leak in hugetlb_unregister_node() 

The sysfs group per_node_hstate_attr_group and hstate_demote_attr_group
when h->demote_order != 0 are created in hugetlb_register_node().  But
these sysfs groups are not removed when unregister the node, thus sysfs
group is leaked.  Using sysfs_remove_group() to fix this issue.

Link: https://lkml.kernel.org/r/20220816130553.31406-6-linmiaohe@huawei.com


Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Reviewed-by: default avatarFengwei Yin <fengwei.yin@intel.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 939de63d

mm/hugetlb.c

+18 −7
Original line number Diff line number Diff line
@@ -3850,12 +3850,18 @@ static int hugetlb_sysfs_add_hstate(struct hstate *h, struct kobject *parent, 
	}



	if (h->demote_order) {

		if (sysfs_create_group(hstate_kobjs[hi],

					&hstate_demote_attr_group))

		retval = sysfs_create_group(hstate_kobjs[hi],

					    &hstate_demote_attr_group);

		if (retval) {

			pr_warn("HugeTLB unable to create demote interfaces for %s\n", h->name);

			sysfs_remove_group(hstate_kobjs[hi], hstate_attr_group);

			kobject_put(hstate_kobjs[hi]);

			hstate_kobjs[hi] = NULL;

			return retval;

		}

	}



	return retval;

	return 0;

}



static void __init hugetlb_sysfs_init(void)
@@ -3941,11 +3947,16 @@ static void hugetlb_unregister_node(struct node *node) 


	for_each_hstate(h) {

		int idx = hstate_index(h);

		if (nhs->hstate_kobjs[idx]) {

			kobject_put(nhs->hstate_kobjs[idx]);

		struct kobject *hstate_kobj = nhs->hstate_kobjs[idx];



		if (!hstate_kobj)

			continue;

		if (h->demote_order)

			sysfs_remove_group(hstate_kobj, &hstate_demote_attr_group);

		sysfs_remove_group(hstate_kobj, &per_node_hstate_attr_group);

		kobject_put(hstate_kobj);

		nhs->hstate_kobjs[idx] = NULL;

	}

	}



	kobject_put(nhs->hugepages_kobj);

	nhs->hugepages_kobj = NULL;