Unverified Commit c36f9d7b authored by Armin Wolf's avatar Armin Wolf Committed by Ilpo Järvinen
Browse files

fs/nls: Fix inconsistency between utf8_to_utf32() and utf32_to_utf8() 



After commit 25524b61 ("fs/nls: Fix utf16 to utf8 conversion"),
the return values of utf8_to_utf32() and utf32_to_utf8() are
inconsistent when encountering an error: utf8_to_utf32() returns -1,
while utf32_to_utf8() returns errno codes. Fix this inconsistency
by modifying utf8_to_utf32() to return errno codes as well.

Fixes: 25524b61 ("fs/nls: Fix utf16 to utf8 conversion")
Suggested-by: default avatarAndy Shevchenko <andriy.shevchenko@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@intel.com>
Signed-off-by: default avatarArmin Wolf <W_Armin@gmx.de>
Link: https://patch.msgid.link/20251129111535.8984-1-W_Armin@gmx.de


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent 859d4cea

fs/nls/nls_base.c

+7 −4
Original line number Diff line number Diff line
@@ -67,19 +67,22 @@ int utf8_to_utf32(const u8 *s, int inlen, unicode_t *pu) 
			l &= t->lmask;

			if (l < t->lval || l > UNICODE_MAX ||

					(l & SURROGATE_MASK) == SURROGATE_PAIR)

				return -1;

				return -EILSEQ;



			*pu = (unicode_t) l;

			return nc;

		}

		if (inlen <= nc)

			return -1;

			return -EOVERFLOW;



		s++;

		c = (*s ^ 0x80) & 0xFF;

		if (c & 0xC0)

			return -1;

			return -EILSEQ;



		l = (l << 6) | c;

	}

	return -1;

	return -EILSEQ;

}

EXPORT_SYMBOL(utf8_to_utf32);