linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: liuyuntao <liuyuntao10@huawei.com>
To: <mike.kravetz@oracle.com>, <akpm@linux-foundation.org>,
	<yaozhenguo1@gmail.com>
Cc: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
	<wuxu.wu@huawei.com>, <fangchuangchuang@huawei.com>,
	<windspectator@gmail.com>
Subject: [PATCH] hugetlbfs: fix a truncation issue in hugepages parameter
Date: Wed, 9 Feb 2022 21:40:18 +0800	[thread overview]
Message-ID: <20220209134018.8242-1-liuyuntao10@huawei.com> (raw)

From: Liu Yuntao <liuyuntao10@huawei.com>

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.

Fixes: b5389086ad7be0 ("hugetlbfs: extend the definition of hugepages parameter to support node allocation")
Signed-off-by: Liu Yuntao <liuyuntao10@huawei.com>
---
 mm/hugetlb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 61895cc01d09..0929547f6ad6 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -4159,10 +4159,10 @@ static int __init hugepages_setup(char *s)
 				pr_warn("HugeTLB: architecture can't support node specific alloc, ignoring!\n");
 				return 0;
 			}
+			if (tmp >= nr_online_nodes)
+				goto invalid;
 			node = tmp;
 			p += count + 1;
-			if (node < 0 || node >= nr_online_nodes)
-				goto invalid;
 			/* Parse hugepages */
 			if (sscanf(p, "%lu%n", &tmp, &count) != 1)
 				goto invalid;
-- 
2.33.0



             reply	other threads:[~2022-02-09 13:40 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-09 13:40 liuyuntao [this message]
2022-02-10  0:43 ` Mike Kravetz
2022-02-10  3:22   ` liuyuntao
2022-02-28  2:59   ` Zhenguo Yao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220209134018.8242-1-liuyuntao10@huawei.com \
    --to=liuyuntao10@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=fangchuangchuang@huawei.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mike.kravetz@oracle.com \
    --cc=windspectator@gmail.com \
    --cc=wuxu.wu@huawei.com \
    --cc=yaozhenguo1@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox