]> git.karo-electronics.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:32:23 +0000 (08:32 -0700)
commitf7d978ef5d1cdbbb7bd7dba5fb995d56b7640b37
tree3b04a482ccab1441a2dd0ecc18429d8db053ce15
parent1d64560a29d149803a119527ad6b3d80b83a85a8
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