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 C62654CB47; Mon, 1 Apr 2024 17:02:35 +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=1711990955; cv=none; b=mmHB+DRetUdT+bnj0L8hrioz5pfAFLBBGFVT573rO4p3gYbr40H7M34+VjWxqMRwUBn93eBLOtFRsaaYG5dCm6IkWKicS2qSCFsDVtMn4fgCy6uCcq/XZupW4CaFdGSury/WmAy9tym4Yfz5oPATDaG0LSQktANbp3WKEu3xsxk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711990955; c=relaxed/simple; bh=dRU428QNPowfHqC7zlQkxm7YiCcanPuynRaI04mFVao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f0Strx5EdF17wLfXiEDYJhysrhSeVel0zxf3A7ZKMA5DwI/rGJ9N4dtu7Iw1PttGZ7p9xGiHbgUiXiVw8xBOr9xGXuuOxkisq+lp8pjLi+9wKl8aQSCo8nAaLWGmO/H4dLnnc03dbxoNLCR5zpM59HFv1mvuwgOXqH5ArH7v8iA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=jh1i9Rmp; 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="jh1i9Rmp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 364FEC433B1; Mon, 1 Apr 2024 17:02:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1711990955; bh=dRU428QNPowfHqC7zlQkxm7YiCcanPuynRaI04mFVao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jh1i9RmpTtJ2YJ3WNsmNAkq3pVv/6vavfuzFVmmgqND2wuifC1+sMXWvRC8P6WxGg LarSGuoxAghrwIOjcSkYJMh9Nx0688ACfgoicNlEjHb5rwxIar0i+9kugg5+2lkaC+ sD5svzSJVZnxQF2LIwlNpZSGPgDjYiwxQcW1hSiU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Samuel Thibault , Sasha Levin Subject: [PATCH 6.1 090/272] speakup: Fix 8bit characters from direct synth Date: Mon, 1 Apr 2024 17:44:40 +0200 Message-ID: <20240401152533.439426092@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240401152530.237785232@linuxfoundation.org> References: <20240401152530.237785232@linuxfoundation.org> User-Agent: quilt/0.67 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-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Samuel Thibault [ Upstream commit b6c8dafc9d86eb77e502bb018ec4105e8d2fbf78 ] When userland echoes 8bit characters to /dev/synth with e.g. echo -e '\xe9' > /dev/synth synth_write would get characters beyond 0x7f, and thus negative when char is signed. When given to synth_buffer_add which takes a u16, this would sign-extend and produce a U+ffxy character rather than U+xy. Users thus get garbled text instead of accents in their output. Let's fix this by making sure that we read unsigned characters. Signed-off-by: Samuel Thibault Fixes: 89fc2ae80bb1 ("speakup: extend synth buffer to 16bit unicode characters") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20240204155736.2oh4ot7tiaa2wpbh@begin Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/accessibility/speakup/synth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/accessibility/speakup/synth.c b/drivers/accessibility/speakup/synth.c index eea2a2fa4f015..45f9061031338 100644 --- a/drivers/accessibility/speakup/synth.c +++ b/drivers/accessibility/speakup/synth.c @@ -208,8 +208,10 @@ void spk_do_flush(void) wake_up_process(speakup_task); } -void synth_write(const char *buf, size_t count) +void synth_write(const char *_buf, size_t count) { + const unsigned char *buf = (const unsigned char *) _buf; + while (count--) synth_buffer_add(*buf++); synth_start(); -- 2.43.0