]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
ALSA: pcm: Return -EBUSY for OSS ioctls changing busy streams
authorTakashi Iwai <tiwai@suse.de>
Fri, 23 Mar 2018 07:03:26 +0000 (08:03 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 21 Oct 2018 07:44:59 +0000 (08:44 +0100)
commit0dbf5ca731ebc0adf5dd4ee3ed5f184fc0ccec3e
treefdfffd306498154123f98911f26b3d93878e49c3
parentc4fffbf08fb25f10bc079ee97940cb559aaaa9f6
ALSA: pcm: Return -EBUSY for OSS ioctls changing busy streams

commit 40cab6e88cb0b6c56d3f30b7491a20e803f948f6 upstream.

OSS PCM stream management isn't modal but it allows ioctls issued at
any time for changing the parameters.  In the previous hardening
patch ("ALSA: pcm: Avoid potential races between OSS ioctls and
read/write"), we covered these races and prevent the corruption by
protecting the concurrent accesses via params_lock mutex.  However,
this means that some ioctls that try to change the stream parameter
(e.g. channels or format) would be blocked until the read/write
finishes, and it may take really long.

Basically changing the parameter while reading/writing is an invalid
operation, hence it's even more user-friendly from the API POV if it
returns -EBUSY in such a situation.

This patch adds such checks in the relevant ioctls with the addition
of read/write access refcount.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
include/sound/pcm_oss.h
sound/core/oss/pcm_oss.c