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

!4609 [sync] PR-4588: fs,hugetlb: fix NULL pointer dereference in hugetlbs_fill_super 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/4588 
 
PR sync from: Liu Shixin <liushixin2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/BOZNK23Q4AZ3GCNZPI7RPCU3GNWPBLBV/ 
 
https://gitee.com/src-openeuler/kernel/issues/I8ZGZK 
 
Link:https://gitee.com/openeuler/kernel/pulls/4609

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents f3a37f7c 6aea64a7

fs/hugetlbfs/inode.c

+4 −2
Original line number Diff line number Diff line
@@ -1312,6 +1312,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;
@@ -1356,11 +1357,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 >> 20);

			return -EINVAL;

		}

		ctx->hstate = h;

		return 0;



	case Opt_min_size: