From: Jesper Juhl Date: Thu, 13 Jan 2011 23:47:22 +0000 (-0800) Subject: mm/hugetlb.c: fix error-path memory leak in nr_hugepages_store_common() X-Git-Tag: v5.15~26764 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=32d6feadf4e17ea9b98071be9bbf402a74a4f818;p=mirror_ubuntu-kernels.git mm/hugetlb.c: fix error-path memory leak in nr_hugepages_store_common() The NODEMASK_ALLOC macro may dynamically allocate memory for its second argument ('nodes_allowed' in this context). In nr_hugepages_store_common() we may abort early if strict_strtoul() fails, but in that case we do not free the memory already allocated to 'nodes_allowed', causing a memory leak. This patch closes the leak by freeing the memory in the error path. [akpm@linux-foundation.org: use NODEMASK_FREE, per Minchan Kim] Signed-off-by: Jesper Juhl Cc: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 7bf223d6677b..8e31cda6fc22 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1374,8 +1374,10 @@ static ssize_t nr_hugepages_store_common(bool obey_mempolicy, NODEMASK_ALLOC(nodemask_t, nodes_allowed, GFP_KERNEL | __GFP_NORETRY); err = strict_strtoul(buf, 10, &count); - if (err) + if (err) { + NODEMASK_FREE(nodes_allowed); return 0; + } h = kobj_to_hstate(kobj, &nid); if (nid == NUMA_NO_NODE) {