superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

After commit 25524b6190 ("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: 25524b6190 ("fs/nls: Fix utf16 to utf8 conversion")
Suggested-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Signed-off-by: Armin Wolf <W_Armin@gmx.de>
Link: https://patch.msgid.link/20251129111535.8984-1-W_Armin@gmx.de
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
pull/1354/merge
Armin Wolf 2025-11-29 12:15:35 +01:00 committed by Ilpo Järvinen
parent 859d4ceacf
commit c36f9d7b28
No known key found for this signature in database
GPG Key ID: 59AC4F6153E5CE31
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/nls/nls_base.c
View File

@ -67,19 +67,22 @@ int utf8_to_utf32(const u8 *s, int inlen, unicode_t *pu)
l &= t->lmask; l &= t->lmask;
if (l < t->lval || l > UNICODE_MAX || if (l < t->lval || l > UNICODE_MAX ||
(l & SURROGATE_MASK) == SURROGATE_PAIR) (l & SURROGATE_MASK) == SURROGATE_PAIR)
return -1; return -EILSEQ;
*pu = (unicode_t) l; *pu = (unicode_t) l;
return nc; return nc;
} }
if (inlen <= nc) if (inlen <= nc)
return -1; return -EOVERFLOW;
s++; s++;
c = (*s ^ 0x80) & 0xFF; c = (*s ^ 0x80) & 0xFF;
if (c & 0xC0) if (c & 0xC0)
return -1; return -EILSEQ;
l = (l << 6) | c; l = (l << 6) | c;
} }
return -1; return -EILSEQ;
} }
EXPORT_SYMBOL(utf8_to_utf32); EXPORT_SYMBOL(utf8_to_utf32);