From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1FD6731E107; Fri, 9 Jan 2026 12:32:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767961970; cv=none; b=tDJNle1K/SRFNmE09eN1fABU0c3z1lMX975V2glQFDb5uLFjVUW+MGGaJl2+LJrbjoLUHgLF1vtIPRBrYkvBi8OB8ovM/dSp4eL8FMwysS8LKNpwGbGupOPz2PT0+w9Us/cDIdFcCQ6dHWJmPubSSyg44K/u97Yru9Id2pU2R88= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767961970; c=relaxed/simple; bh=XfkUsvOfmwf2GQJH+Ut7ClCzdau36x15dg0z5nD8ImY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=b2nXQijmCCdBe3FNhm8CImkc8dyRg9ut6u1R/85yVq3Wo3906ABL0U59jdihc5tQfFx/VEvDFwz5x6i1xje5F0LDAWw/KJklNkVrpRlzCdqjzkzztlyTZmszdDLHZ03r1DTK/ajmL2maJSYJ2BbgwWHpFvW0qBxdUFPPTTemmFU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cs82B2RF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cs82B2RF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1570C4CEF1; Fri, 9 Jan 2026 12:32:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1767961970; bh=XfkUsvOfmwf2GQJH+Ut7ClCzdau36x15dg0z5nD8ImY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cs82B2RFYxMCxziHs9mc8G1bcaCbEt55lS4e74YPqTEW+jD5YMLSJkTHMr9i8s8ll UFfPvgZH65ik8UKBsKO9s+iq88jcNbPB12iePh9ZgRi+Hy3RNYLKGlKvoZ0QZ/nNUg Gtm5uH168s7Y/32XkEAcwdoOFne2N6LW4w0ms0wk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andy Shevchenko , Armin Wolf , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Sasha Levin Subject: [PATCH 6.1 199/634] fs/nls: Fix inconsistency between utf8_to_utf32() and utf32_to_utf8() Date: Fri, 9 Jan 2026 12:37:57 +0100 Message-ID: <20260109112124.922805770@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260109112117.407257400@linuxfoundation.org> References: <20260109112117.407257400@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Armin Wolf [ Upstream commit c36f9d7b2869a003a2f7d6ff2c6bac9e62fd7d68 ] After commit 25524b619029 ("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: 25524b619029 ("fs/nls: Fix utf16 to utf8 conversion") Suggested-by: Andy Shevchenko Reviewed-by: Andy Shevchenko Signed-off-by: Armin Wolf Link: https://patch.msgid.link/20251129111535.8984-1-W_Armin@gmx.de Reviewed-by: Ilpo Järvinen Signed-off-by: Ilpo Järvinen Signed-off-by: Sasha Levin --- fs/nls/nls_base.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c index 7eacded3c17d1..f072eb6b563f6 100644 --- a/fs/nls/nls_base.c +++ b/fs/nls/nls_base.c @@ -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); -- 2.51.0