summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2024-03-23 17:48:43 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-05-02 16:17:10 +0200
commit756c5cb7c09e537b87b5d3acafcb101b2ccf394f (patch)
tree6ffbef585813f9ad6f1ef18a5f6facf8e77b4b1f
parent257d313e37d66c3bcc87197fb5b8549129c45dfe (diff)
downloadlinux-stable-756c5cb7c09e537b87b5d3acafcb101b2ccf394f.tar.gz
linux-stable-756c5cb7c09e537b87b5d3acafcb101b2ccf394f.tar.bz2
linux-stable-756c5cb7c09e537b87b5d3acafcb101b2ccf394f.zip
speakup: Avoid crash on very long word
commit c8d2f34ea96ea3bce6ba2535f867f0d4ee3b22e1 upstream. In case a console is set up really large and contains a really long word (> 256 characters), we have to stop before the length of the word buffer. Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Fixes: c6e3fd22cd538 ("Staging: add speakup to the staging directory") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20240323164843.1426997-1-samuel.thibault@ens-lyon.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/speakup/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index 5e4e2f423e42..0b537efcee05 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -577,7 +577,7 @@ static u_long get_word(struct vc_data *vc)
}
attr_ch = get_char(vc, (u_short *)tmp_pos, &spk_attr);
buf[cnt++] = attr_ch;
- while (tmpx < vc->vc_cols - 1) {
+ while (tmpx < vc->vc_cols - 1 && cnt < sizeof(buf) - 1) {
tmp_pos += 2;
tmpx++;
ch = get_char(vc, (u_short *)tmp_pos, &temp);