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

!1788 exfat: check if filename entries exceeds max filename length 

Merge Pull Request from: @ci-robot 
 
PR sync from: ZhaoLong Wang <wangzhaolong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/DQYYYBQY5VIVHRZYE472SI2JF7U3YOM6/ 
 
https://gitee.com/src-openeuler/kernel/issues/I7TLII 
 
Link:https://gitee.com/openeuler/kernel/pulls/1788

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 9cc04c4e cf2b2efc

fs/exfat/dir.c

+7 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ static void exfat_get_uniname_from_ext_entry(struct super_block *sb, 
{

	int i;

	struct exfat_entry_set_cache *es;

	unsigned int uni_len = 0, len;



	es = exfat_get_dentry_set(sb, p_dir, entry, ES_ALL_ENTRIES);

	if (!es)
@@ -51,7 +52,10 @@ static void exfat_get_uniname_from_ext_entry(struct super_block *sb, 
		if (exfat_get_entry_type(ep) != TYPE_EXTEND)

			break;



		exfat_extract_uni_name(ep, uniname);

		len = exfat_extract_uni_name(ep, uniname);

		uni_len += len;

		if (len != EXFAT_FILE_NAME_LEN || uni_len >= MAX_NAME_LENGTH)

			break;

		uniname += EXFAT_FILE_NAME_LEN;

	}
@@ -1026,7 +1030,8 @@ int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei, 
			if (entry_type == TYPE_EXTEND) {

				unsigned short entry_uniname[16], unichar;



				if (step != DIRENT_STEP_NAME) {

				if (step != DIRENT_STEP_NAME ||

				    name_len >= MAX_NAME_LENGTH) {

					step = DIRENT_STEP_FILE;

					continue;

				}