Unverified Commit 67b6657b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4589 fs,hugetlb: fix NULL pointer dereference in hugetlbs_fill_super 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Shixin <liushixin2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/TTUTSHDFYQW55S25PQJMJYLYTCHLRO5Q/ 
 
https://gitee.com/src-openeuler/kernel/issues/I8ZGZK 
 
Link:https://gitee.com/openeuler/kernel/pulls/4589

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents bfba4160 3fd1a23e

fs/hugetlbfs/inode.c

+4 −2
Original line number Diff line number Diff line
@@ -1395,6 +1395,7 @@ static int hugetlbfs_parse_param(struct fs_context *fc, struct fs_parameter *par 
{

	struct hugetlbfs_fs_context *ctx = fc->fs_private;

	struct fs_parse_result result;

	struct hstate *h;

	char *rest;

	unsigned long ps;

	int opt;
@@ -1439,11 +1440,12 @@ static int hugetlbfs_parse_param(struct fs_context *fc, struct fs_parameter *par 


	case Opt_pagesize:

		ps = memparse(param->string, &rest);

		ctx->hstate = size_to_hstate(ps);

		if (!ctx->hstate) {

		h = size_to_hstate(ps);

		if (!h) {

			pr_err("Unsupported page size %lu MB\n", ps / SZ_1M);

			return -EINVAL;

		}

		ctx->hstate = h;

		return 0;



	case Opt_min_size: