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

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

ALSA: pcm: Add missing error checks in OSS emulation plugin builder 



commit 6708913750344a900f2e73bfe4a4d6dbbce4fe8d upstream.

In the OSS emulation plugin builder where the frame size is parsed in
the plugin chain, some places miss the possible errors returned from
the plugin src_ or dst_frames callback.

This patch papers over such places.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f8c035f6

sound/core/oss/pcm_plugin.c

+11 −3
Original line number Diff line number Diff line
@@ -591,18 +591,26 @@ snd_pcm_sframes_t snd_pcm_plug_write_transfer(struct snd_pcm_substream *plug, st 
	snd_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;