Commit 0224028e authored by Takashi Iwai's avatar Takashi Iwai Committed by Sasha Levin

ALSA: hda: Fix krealloc() with __GFP_ZERO usage

[ Upstream commit 33baefe5 ]

krealloc() doesn't work always properly with __GFP_ZERO flag as
expected.  For clearing the reallocated area, we need to clear
explicitly instead.
Reported-by: default avatarJoe Perches <joe@perches.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent df75887f
...@@ -21,13 +21,15 @@ void *snd_array_new(struct snd_array *array) ...@@ -21,13 +21,15 @@ void *snd_array_new(struct snd_array *array)
return NULL; return NULL;
if (array->used >= array->alloced) { if (array->used >= array->alloced) {
int num = array->alloced + array->alloc_align; int num = array->alloced + array->alloc_align;
int oldsize = array->alloced * array->elem_size;
int size = (num + 1) * array->elem_size; int size = (num + 1) * array->elem_size;
void *nlist; void *nlist;
if (snd_BUG_ON(num >= 4096)) if (snd_BUG_ON(num >= 4096))
return NULL; return NULL;
nlist = krealloc(array->list, size, GFP_KERNEL | __GFP_ZERO); nlist = krealloc(array->list, size, GFP_KERNEL);
if (!nlist) if (!nlist)
return NULL; return NULL;
memset(nlist + oldsize, 0, size - oldsize);
array->list = nlist; array->list = nlist;
array->alloced = num; array->alloced = num;
} }
......
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