diff options
author | Xishi Qiu <qiuxishi@huawei.com> | 2015-11-06 03:48:11 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-06 04:34:48 +0100 |
commit | 9fd745d450e7e2b0d2f1b386b886e7d568b64404 (patch) | |
tree | e202e5a23fc2e03b2905fdaffa130a991a9d0957 /mm/page_alloc.c | |
parent | mm/vmscan.c: fix types of some locals (diff) | |
download | linux-9fd745d450e7e2b0d2f1b386b886e7d568b64404.tar.xz linux-9fd745d450e7e2b0d2f1b386b886e7d568b64404.zip |
mm: fix overflow in find_zone_movable_pfns_for_nodes()
If the user set "movablecore=xx" to a large number, corepages will
overflow. Fix the problem.
Signed-off-by: Xishi Qiu <qiuxishi@huawei.com>
Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Acked-by: Tang Chen <tangchen@cn.fujitsu.com>
Acked-by: David Rientjes <rientjes@google.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Cc: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index c60605df9b48..4aed338fc535 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5666,6 +5666,7 @@ static void __init find_zone_movable_pfns_for_nodes(void) */ required_movablecore = roundup(required_movablecore, MAX_ORDER_NR_PAGES); + required_movablecore = min(totalpages, required_movablecore); corepages = totalpages - required_movablecore; required_kernelcore = max(required_kernelcore, corepages); |