Commit 333d3882 authored by Linus Torvalds's avatar Linus Torvalds Committed by Cheng Yu
Browse files

Revert "unicode: Don't special case ignorable code points" 

stable inclusion
from stable-v5.10.231
commit c3cded0ff622f5981eec06c35e1b8d375a3c2c27
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBD0BE

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c3cded0ff622f5981eec06c35e1b8d375a3c2c27



--------------------------------

commit 231825b2e1ff6ba799c5eaf396d3ab2354e37c6b upstream.

This reverts commit 5c26d2f1d3f5e4be3e196526bead29ecb139cf91.

It turns out that we can't do this, because while the old behavior of
ignoring ignorable code points was most definitely wrong, we have
case-folding filesystems with on-disk hash values with that wrong
behavior.

So now you can't look up those names, because they hash to something
different.

Of course, it's also entirely possible that in the meantime people have
created *new* files with the new ("more correct") case folding logic,
and reverting will just make other things break.

The correct solution is to not do case folding in filesystems, but
sadly, people seem to never really understand that.  People still see it
as a feature, not a bug.

Reported-by: default avatarQi Han <hanqi@vivo.com>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=219586


Cc: Gabriel Krisman Bertazi <krisman@suse.de>
Requested-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarCheng Yu <serein.chengyu@huawei.com>
parent e804413f

fs/unicode/mkutf8data.c

+70 −0
Original line number Diff line number Diff line
@@ -2230,6 +2230,75 @@ static void nfdicf_init(void) 
		file_fail(fold_name);

}



static void ignore_init(void)

{

	FILE *file;

	unsigned int unichar;

	unsigned int first;

	unsigned int last;

	unsigned int *um;

	int count;

	int ret;



	if (verbose > 0)

		printf("Parsing %s\n", prop_name);

	file = fopen(prop_name, "r");

	if (!file)

		open_fail(prop_name, errno);

	assert(file);

	count = 0;

	while (fgets(line, LINESIZE, file)) {

		ret = sscanf(line, "%X..%X ; %s # ", &first, &last, buf0);

		if (ret == 3) {

			if (strcmp(buf0, "Default_Ignorable_Code_Point"))

				continue;

			if (!utf32valid(first) || !utf32valid(last))

				line_fail(prop_name, line);

			for (unichar = first; unichar <= last; unichar++) {

				free(unicode_data[unichar].utf32nfdi);

				um = malloc(sizeof(unsigned int));

				*um = 0;

				unicode_data[unichar].utf32nfdi = um;

				free(unicode_data[unichar].utf32nfdicf);

				um = malloc(sizeof(unsigned int));

				*um = 0;

				unicode_data[unichar].utf32nfdicf = um;

				count++;

			}

			if (verbose > 1)

				printf(" %X..%X Default_Ignorable_Code_Point\n",

					first, last);

			continue;

		}

		ret = sscanf(line, "%X ; %s # ", &unichar, buf0);

		if (ret == 2) {

			if (strcmp(buf0, "Default_Ignorable_Code_Point"))

				continue;

			if (!utf32valid(unichar))

				line_fail(prop_name, line);

			free(unicode_data[unichar].utf32nfdi);

			um = malloc(sizeof(unsigned int));

			*um = 0;

			unicode_data[unichar].utf32nfdi = um;

			free(unicode_data[unichar].utf32nfdicf);

			um = malloc(sizeof(unsigned int));

			*um = 0;

			unicode_data[unichar].utf32nfdicf = um;

			if (verbose > 1)

				printf(" %X Default_Ignorable_Code_Point\n",

					unichar);

			count++;

			continue;

		}

	}

	fclose(file);



	if (verbose > 0)

		printf("Found %d entries\n", count);

	if (count == 0)

		file_fail(prop_name);

}



static void corrections_init(void)

{

	FILE *file;
@@ -3327,6 +3396,7 @@ int main(int argc, char *argv[]) 
	ccc_init();

	nfdi_init();

	nfdicf_init();

	ignore_init();

	corrections_init();

	hangul_decompose();

	nfdi_decompose();

fs/unicode/utf8data.h_shipped

+3357 −3346

File changed.

Preview size limit exceeded, changes collapsed.