iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hugetlbfs: fix a truncation issue in hugepages parameter

Browse Source 
When we specify a large number for node in hugepages parameter, it may
be parsed to another number due to truncation in this statement:

	node = tmp;

For example, add following parameter in command line:

	hugepagesz=1G hugepages=4294967297:5

and kernel will allocate 5 hugepages for node 1 instead of ignoring it.

I move the validation check earlier to fix this issue, and slightly
simplifies the condition here.

Link: https://lkml.kernel.org/r/20220209134018.8242-1-liuyuntao10@huawei.com
Fixes: b5389086ad7be0 ("hugetlbfs: extend the definition of hugepages parameter to support node allocation")
Signed-off-by: Liu Yuntao <liuyuntao10@huawei.com>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Liu Yuntao 2022-02-25 19:11:02 -08:00 committed by Linus Torvalds
parent 70effdc375
commit e79ce98323
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mm/hugetlb.c
View File

@ -4159,10 +4159,10 @@ static int __init hugepages_setup(char *s)
pr_warn("HugeTLB: architecture can't support node specific alloc, ignoring!\n"); pr_warn("HugeTLB: architecture can't support node specific alloc, ignoring!\n");
return 0; return 0;
} }
if (tmp >= nr_online_nodes)
goto invalid;
node = tmp; node = tmp;
p += count + 1; p += count + 1;
if (node < 0 || node >= nr_online_nodes)
goto invalid;
/* Parse hugepages */ /* Parse hugepages */
if (sscanf(p, "%lu%n", &tmp, &count) != 1) if (sscanf(p, "%lu%n", &tmp, &count) != 1)
goto invalid; goto invalid;