1 files changed, 4 insertions, 4 deletions

diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
index 2224b4d07bf0..44a88a9fa2c8 100644
--- a/fs/nls/nls_base.c
+++ b/fs/nls/nls_base.c
@@ -124,10 +124,10 @@ int utf8s_to_utf16s(const u8 *s, int len, wchar_t *pwcs)
         while (*s && len > 0) {
                 if (*s & 0x80) {
                         size = utf8_to_utf32(s, len, &u);
-                        if (size < 0) {
-                                /* Ignore character and move on */
-                                size = 1;
-                        } else if (u >= PLANE_SIZE) {
+                        if (size < 0)
+                                return -EINVAL;
+
+                        if (u >= PLANE_SIZE) {
                                 u -= PLANE_SIZE;
                                 *op++ = (wchar_t) (SURROGATE_PAIR |
                                                 ((u >> 10) & SURROGATE_BITS));