]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
staging: speakup_soft: Fix reading of init string
authorBen Hutchings <ben@decadent.org.uk>
Sun, 16 Sep 2012 03:18:50 +0000 (04:18 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 7 Oct 2012 15:39:30 +0000 (08:39 -0700)
commit3d6cbe2361ebbb5a0037225af0cd890e666b2ec0
tree8d08cbef5116a7f31c8aec5ace6ad5511e471677
parentcef87aeb39d942deac8196e46c4233721357cce2
staging: speakup_soft: Fix reading of init string

commit 40fe4f89671fb3c7ded94190fb267402a38b0261 upstream.

softsynth_read() reads a character at a time from the init string;
when it finds the null terminator it sets the initialized flag but
then repeats the last character.

Additionally, if the read() buffer is not big enough for the init
string, the next read() will start reading from the beginning again.
So the caller may never progress to reading anything else.

Replace the simple initialized flag with the current position in
the init string, carried over between calls.  Switch to reading
real data once this reaches the null terminator.

(This assumes that the length of the init string can't change, which
seems to be the case.  Really, the string and position belong together
in a per-file private struct.)

Tested-by: Samuel Thibault <sthibault@debian.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/speakup/speakup_soft.c