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

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

commit 639db596 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
...@@ -2146,8 +2146,7 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir, ...@@ -2146,8 +2146,7 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir,
stream->resources, en, stream->resources, en,
VORTEX_RESOURCE_SRC)) < 0) { VORTEX_RESOURCE_SRC)) < 0) {
memset(stream->resources, 0, memset(stream->resources, 0,
sizeof(unsigned char) * sizeof(stream->resources));
VORTEX_RESOURCE_LAST);
return -EBUSY; return -EBUSY;
} }
if (stream->type != VORTEX_PCM_A3D) { if (stream->type != VORTEX_PCM_A3D) {
...@@ -2157,7 +2156,7 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir, ...@@ -2157,7 +2156,7 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir,
VORTEX_RESOURCE_MIXIN)) < 0) { VORTEX_RESOURCE_MIXIN)) < 0) {
memset(stream->resources, memset(stream->resources,
0, 0,
sizeof(unsigned char) * VORTEX_RESOURCE_LAST); sizeof(stream->resources));
return -EBUSY; return -EBUSY;
} }
} }
...@@ -2170,8 +2169,7 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir, ...@@ -2170,8 +2169,7 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir,
stream->resources, en, stream->resources, en,
VORTEX_RESOURCE_A3D)) < 0) { VORTEX_RESOURCE_A3D)) < 0) {
memset(stream->resources, 0, memset(stream->resources, 0,
sizeof(unsigned char) * sizeof(stream->resources));
VORTEX_RESOURCE_LAST);
pr_err( "vortex: out of A3D sources. Sorry\n"); pr_err( "vortex: out of A3D sources. Sorry\n");
return -EBUSY; return -EBUSY;
} }
...@@ -2283,8 +2281,7 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir, ...@@ -2283,8 +2281,7 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir,
VORTEX_RESOURCE_MIXOUT)) VORTEX_RESOURCE_MIXOUT))
< 0) { < 0) {
memset(stream->resources, 0, memset(stream->resources, 0,
sizeof(unsigned char) * sizeof(stream->resources));
VORTEX_RESOURCE_LAST);
return -EBUSY; return -EBUSY;
} }
if ((src[i] = if ((src[i] =
...@@ -2292,8 +2289,7 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir, ...@@ -2292,8 +2289,7 @@ vortex_adb_allocroute(vortex_t *vortex, int dma, int nr_ch, int dir,
stream->resources, en, stream->resources, en,
VORTEX_RESOURCE_SRC)) < 0) { VORTEX_RESOURCE_SRC)) < 0) {
memset(stream->resources, 0, memset(stream->resources, 0,
sizeof(unsigned char) * sizeof(stream->resources));
VORTEX_RESOURCE_LAST);
return -EBUSY; return -EBUSY;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment