]> git.karo-electronics.de Git - karo-tx-linux.git/commit
ALSA: pcm: fix delta calculation at boundary wraparound
authorClemens Ladisch <clemens@ladisch.de>
Tue, 25 May 2010 07:01:46 +0000 (09:01 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 25 May 2010 18:23:48 +0000 (20:23 +0200)
commitb406e6103baa3da85950f22d3d46d21a8da654c5
tree3b989503e6d5c75795980a0387c35fcd82c13ee0
parent57c7ffc9414d79c8ec25800bbdbf8f801b2f148a
ALSA: pcm: fix delta calculation at boundary wraparound

In the cleanup of the hw_ptr update functions in 2.6.33, the calculation
of the delta value was changed to use the modulo operator to protect
against a negative difference due to the pointer wrapping around at the
boundary.

However, the ptr variables are unsigned, so a negative difference would
result in the two complement's value which has no relation to the actual
difference relative to the boundary; the result is typically some value
near LONG_MAX-boundary.  Furthermore, even if the modulo operation would
be done with signed types, the result of a negative dividend could be
negative.

The invalid delta value is then caught by the following checks, but this
means that the pointer update is ignored.

To fix this, use a range check as in the other pointer calculations.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/core/pcm_lib.c