mirror of https://gitee.com/openkylin/linux.git
ALSA: au88x0: Fix zero clear of stream->resources
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: David Binderman <dcb314@hotmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
ff38e0c70a
commit
639db59616
|
@ -2151,8 +2151,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) {
|
||||
|
@ -2162,7 +2161,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;
|
||||
}
|
||||
}
|
||||
|
@ -2175,8 +2174,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));
|
||||
dev_err(vortex->card->dev,
|
||||
"out of A3D sources. Sorry\n");
|
||||
return -EBUSY;
|
||||
|
@ -2290,8 +2288,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] =
|
||||
|
@ -2299,8 +2296,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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue