| From 6665bb30a6b1a4a853d52557c05482ee50e71391 Mon Sep 17 00:00:00 2001 |
| From: Takashi Iwai <tiwai@suse.de> |
| Date: Wed, 1 Dec 2021 08:36:06 +0100 |
| Subject: ALSA: pcm: oss: Handle missing errors in snd_pcm_oss_change_params*() |
| |
| From: Takashi Iwai <tiwai@suse.de> |
| |
| commit 6665bb30a6b1a4a853d52557c05482ee50e71391 upstream. |
| |
| A couple of calls in snd_pcm_oss_change_params_locked() ignore the |
| possible errors. Catch those errors and abort the operation for |
| avoiding further problems. |
| |
| Cc: <stable@vger.kernel.org> |
| Link: https://lore.kernel.org/r/20211201073606.11660-4-tiwai@suse.de |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| sound/core/oss/pcm_oss.c | 11 +++++++++-- |
| 1 file changed, 9 insertions(+), 2 deletions(-) |
| |
| --- a/sound/core/oss/pcm_oss.c |
| +++ b/sound/core/oss/pcm_oss.c |
| @@ -909,8 +909,15 @@ static int snd_pcm_oss_change_params_loc |
| err = -EINVAL; |
| goto failure; |
| } |
| - choose_rate(substream, sparams, runtime->oss.rate); |
| - snd_pcm_hw_param_near(substream, sparams, SNDRV_PCM_HW_PARAM_CHANNELS, runtime->oss.channels, NULL); |
| + |
| + err = choose_rate(substream, sparams, runtime->oss.rate); |
| + if (err < 0) |
| + goto failure; |
| + err = snd_pcm_hw_param_near(substream, sparams, |
| + SNDRV_PCM_HW_PARAM_CHANNELS, |
| + runtime->oss.channels, NULL); |
| + if (err < 0) |
| + goto failure; |
| |
| format = snd_pcm_oss_format_from(runtime->oss.format); |
| |
