diff options
author | Jesper Juhl <jj@chaosbits.net> | 2011-01-13 18:47:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 20:32:48 -0500 |
commit | 32d6feadf4e17ea9b98071be9bbf402a74a4f818 (patch) | |
tree | 62427ca91992c87399211fec6294533fac0e7464 /mm | |
parent | 29c1f677d424e8c5683a837fc4f03fc9f19201d7 (diff) |
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 <jj@chaosbits.net>
Cc: Minchan Kim <minchan.kim@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/hugetlb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 7bf223d6677..8e31cda6fc2 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
@@ -1374,8 +1374,10 @@ static ssize_t nr_hugepages_store_common(bool obey_mempolicy, | |||
1374 | NODEMASK_ALLOC(nodemask_t, nodes_allowed, GFP_KERNEL | __GFP_NORETRY); | 1374 | NODEMASK_ALLOC(nodemask_t, nodes_allowed, GFP_KERNEL | __GFP_NORETRY); |
1375 | 1375 | ||
1376 | err = strict_strtoul(buf, 10, &count); | 1376 | err = strict_strtoul(buf, 10, &count); |
1377 | if (err) | 1377 | if (err) { |
1378 | NODEMASK_FREE(nodes_allowed); | ||
1378 | return 0; | 1379 | return 0; |
1380 | } | ||
1379 | 1381 | ||
1380 | h = kobj_to_hstate(kobj, &nid); | 1382 | h = kobj_to_hstate(kobj, &nid); |
1381 | if (nid == NUMA_NO_NODE) { | 1383 | if (nid == NUMA_NO_NODE) { |