diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-08-03 15:13:00 +0200 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-08-19 23:08:35 -0400 |
| commit | 0224028e1bcf2d49531308b971b8485c552c1510 (patch) | |
| tree | 9cc45d5b0392b142b942e4bb106f96ce11612d83 /sound | |
| parent | df75887f42357dd8392bd856280be8e835d10a02 (diff) | |
ALSA: hda: Fix krealloc() with __GFP_ZERO usage
[ Upstream commit 33baefe5e72f17a6df378e48196cd8cada11deec ]
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: Joe Perches <joe@perches.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/hda/array.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/hda/array.c b/sound/hda/array.c index 516795baa7db..5dfa610e4471 100644 --- a/sound/hda/array.c +++ b/sound/hda/array.c @@ -21,13 +21,15 @@ void *snd_array_new(struct snd_array *array) return NULL; if (array->used >= array->alloced) { int num = array->alloced + array->alloc_align; + int oldsize = array->alloced * array->elem_size; int size = (num + 1) * array->elem_size; void *nlist; if (snd_BUG_ON(num >= 4096)) return NULL; - nlist = krealloc(array->list, size, GFP_KERNEL | __GFP_ZERO); + nlist = krealloc(array->list, size, GFP_KERNEL); if (!nlist) return NULL; + memset(nlist + oldsize, 0, size - oldsize); array->list = nlist; array->alloced = num; } |