Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cf51a98 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman
Browse files

ALSA: pcm: oss: Handle missing errors in snd_pcm_oss_change_params*() 

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: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2e54cf67

sound/core/oss/pcm_oss.c

+9 −2
Original line number Original line Diff line number Diff line
@@ -899,8 +899,15 @@ static int snd_pcm_oss_change_params_locked(struct snd_pcm_substream *substream) 
		err = -EINVAL;

		err = -EINVAL;

		goto failure;

		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);

	format = snd_pcm_oss_format_from(runtime->oss.format);