sound fixes for 4.15-rc8
Linus,
please pull sound fixes for v4.15-rc8 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-4.15-rc8
The topmost commit is 900498a34a3ac9c611e9b425094c8106bdd7dc1c
----------------------------------------------------------------
sound fixes for 4.15-rc8
A collection of the last-minute small PCM fixes:
- A workaround for the recent regression wrt PulseAudio
- Removal of spurious WARN_ON() that is triggered by syzkaller
- Fixes for aloop, hardening racy accesses
- Fixes in PCM OSS emulation wrt the unabortable loops that may cause RCU stall
----------------------------------------------------------------
Takashi Iwai (8):
ALSA: pcm: Remove incorrect snd_BUG_ON() usages
ALSA: pcm: Add missing error checks in OSS emulation plugin builder
ALSA: pcm: Workaround for weird PulseAudio behavior on rewind error
ALSA: aloop: Release cable upon open error path
ALSA: aloop: Fix inconsistent format due to incomplete rule
ALSA: aloop: Fix racy hw constraints adjustment
ALSA: pcm: Abort properly at pending signal in OSS read/write loops
ALSA: pcm: Allow aborting mutex lock at OSS read/write loops
--- sound/core/oss/pcm_oss.c | 41 ++++++++++++------- sound/core/oss/pcm_plugin.c | 14 +++++-- sound/core/pcm_lib.c | 4 +- sound/core/pcm_native.c | 9 ++++- sound/drivers/aloop.c | 98 +++++++++++++++++++++++---------------------- 5 files changed, 97 insertions(+), 69 deletions(-)
sound/core/oss/pcm_oss.c +27 -14
@@ -455,7 +455,6 @@ static int snd_pcm_hw_param_near(struct snd_pcm_substream *pcm, v =snd_pcm_hw_param_last (pcm, params, var, dir); else v =snd_pcm_hw_param_first (pcm, params, var, dir); -snd_BUG_ON (v <0 );return v; }
@@ -1335,8 +1334,11 @@ static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream *substream, const chaif ((tmp =snd_pcm_oss_make_ready (substream)) <0 )return tmp; -mutex_lock (&runtime->oss.params_lock);while (bytes >0 ) { +if (mutex_lock_interruptible (&runtime->oss.params_lock)) { + tmp = -ERESTARTSYS ; +break ; + }if (bytes < runtime->oss.period_bytes || runtime->oss.buffer_used >0 ) { tmp = bytes;if (tmp + runtime->oss.buffer_used > runtime->oss.period_bytes)
@@ -1380,14 +1382,18 @@ static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream *substream, const cha xfer += tmp;if ((substream->f_flags &O_NONBLOCK ) !=0 && tmp != runtime->oss.period_bytes) -break ; + tmp = -EAGAIN ; } - } -mutex_unlock (&runtime->oss.params_lock); -return xfer; - err: -mutex_unlock (&runtime->oss.params_lock); +mutex_unlock (&runtime->oss.params_lock); +if (tmp <0 ) +break ; +if (signal_pending (current)) { + tmp = -ERESTARTSYS ; +break ; + } + tmp =0 ; + }return xfer >0 ? (snd_pcm_sframes_t )xfer : tmp; }
@@ -1435,8 +1441,11 @@ static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __useif ((tmp =snd_pcm_oss_make_ready (substream)) <0 )return tmp; -mutex_lock (&runtime->oss.params_lock);while (bytes >0 ) { +if (mutex_lock_interruptible (&runtime->oss.params_lock)) { + tmp = -ERESTARTSYS ; +break ; + }if (bytes < runtime->oss.period_bytes || runtime->oss.buffer_used >0 ) {if (runtime->oss.buffer_used ==0 ) { tmp =snd_pcm_oss_read2 (substream, runtime->oss.buffer, runtime->oss.period_bytes,1 );
@@ -1467,12 +1476,16 @@ static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __use bytes -= tmp; xfer += tmp; } - } -mutex_unlock (&runtime->oss.params_lock); -return xfer; - err: -mutex_unlock (&runtime->oss.params_lock); +mutex_unlock (&runtime->oss.params_lock); +if (tmp <0 ) +break ; +if (signal_pending (current)) { + tmp = -ERESTARTSYS ; +break ; + } + tmp =0 ; + }return xfer >0 ? (snd_pcm_sframes_t )xfer : tmp; }
sound/core/oss/pcm_plugin.c +11 -3
@@ -592,18 +592,26 @@ snd_pcm_sframes_t snd_pcm_plug_write_transfer(struct snd_pcm_substream *plug, stsnd_pcm_sframes_t frames = size; plugin =snd_pcm_plug_first (plug); -while (plugin && frames >0 ) { +while (plugin) { +if (frames <=0 ) +return frames;if ((next = plugin->next) !=NULL ) {snd_pcm_sframes_t frames1 = frames; -if (plugin->dst_frames) +if (plugin->dst_frames) { frames1 = plugin->dst_frames (plugin, frames); +if (frames1 <=0 ) +return frames1; + }if ((err = next->client_channels (next, frames1, &dst_channels)) <0 ) {return err; }if (err != frames1) { frames = err; -if (plugin->src_frames) +if (plugin->src_frames) { frames = plugin->src_frames (plugin, frames1); +if (frames <=0 ) +return frames; + } } }else dst_channels =NULL ;
sound/core/pcm_lib.c +2 -2
@@ -1632,7 +1632,7 @@ int snd_pcm_hw_param_first(struct snd_pcm_substream *pcm,return changed;if (params->rmask) {int err =snd_pcm_hw_refine (pcm, params); -if (snd_BUG_ON (err <0 )) +if (err <0 )return err; }return snd_pcm_hw_param_value (params, var, dir);
@@ -1678,7 +1678,7 @@ int snd_pcm_hw_param_last(struct snd_pcm_substream *pcm,return changed;if (params->rmask) {int err =snd_pcm_hw_refine (pcm, params); -if (snd_BUG_ON (err <0 )) +if (err <0 )return err; }return snd_pcm_hw_param_value (params, var, dir);
sound/core/pcm_native.c +7 -2
@@ -2580,7 +2580,7 @@ static snd_pcm_sframes_t forward_appl_ptr(struct snd_pcm_substream *substream,return ret <0 ? ret : frames; } -/* decrease the appl_ptr; returns the processed frames or a negative error */ +/* decrease the appl_ptr; returns the processed frames or zero for error */ static snd_pcm_sframes_t rewind_appl_ptr (struct snd_pcm_substream *substream,snd_pcm_uframes_t frames,snd_pcm_sframes_t avail)
@@ -2597,7 +2597,12 @@ static snd_pcm_sframes_t rewind_appl_ptr(struct snd_pcm_substream *substream,if (appl_ptr <0 ) appl_ptr += runtime->boundary; ret =pcm_lib_apply_appl_ptr (substream, appl_ptr); -return ret <0 ? ret : frames; +/* NOTE: we return zero for errors because PulseAudio gets depressed +* upon receiving an error from rewind ioctl and stops processing +* any longer. Returning zero means that no rewind is done, so +* it's not absolutely wrong to answer like that. +*/ +return ret <0 ?0 : frames; } static snd_pcm_sframes_t snd_pcm_playback_rewind(struct snd_pcm_substream *substream,
sound/drivers/aloop.c +50 -48
185 lines not on this page · raw message