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

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

ALSA: au88x0: Fix zero clear of stream->resources 



commit 639db596165746ca87bbcb56559b094fd9042890 upstream.

There are a few calls of memset() to stream->resources, but they all
are called in a wrong size, sizeof(unsigned char) * VORTEX_RESOURCE_LAST,
while this field is a u32 array.  This may leave the memories not
zero-cleared.

Fix it by replacing them with a simpler sizeof(stream->resources)
instead.

Reported-by: default avatarDavid Binderman <dcb314@hotmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8df25142

sound/pci/au88x0/au88x0_core.c

+5 −9
Original line number Diff line number Diff line
@@ -2146,8 +2146,7 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir, 
							   stream->resources, en,

							   VORTEX_RESOURCE_SRC)) < 0) {

					memset(stream->resources, 0,

					       sizeof(unsigned char) *

					       VORTEX_RESOURCE_LAST);

					       sizeof(stream->resources));

					return -EBUSY;

				}

				if (stream->type != VORTEX_PCM_A3D) {
@@ -2157,7 +2156,7 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir, 
								   VORTEX_RESOURCE_MIXIN)) < 0) {

						memset(stream->resources,

						       0,

						       sizeof(unsigned char) * VORTEX_RESOURCE_LAST);

						       sizeof(stream->resources));

						return -EBUSY;

					}

				}
@@ -2170,8 +2169,7 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir, 
						   stream->resources, en,

						   VORTEX_RESOURCE_A3D)) < 0) {

				memset(stream->resources, 0,

				       sizeof(unsigned char) *

				       VORTEX_RESOURCE_LAST);

				       sizeof(stream->resources));

				pr_err( "vortex: out of A3D sources. Sorry\n");

				return -EBUSY;

			}
@@ -2283,8 +2281,7 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir, 
						   VORTEX_RESOURCE_MIXOUT))

			    < 0) {

				memset(stream->resources, 0,

				       sizeof(unsigned char) *

				       VORTEX_RESOURCE_LAST);

				       sizeof(stream->resources));

				return -EBUSY;

			}

			if ((src[i] =
@@ -2292,8 +2289,7 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir, 
						   stream->resources, en,

						   VORTEX_RESOURCE_SRC)) < 0) {

				memset(stream->resources, 0,

				       sizeof(unsigned char) *

				       VORTEX_RESOURCE_LAST);

				       sizeof(stream->resources));

				return -EBUSY;

			}

		}