diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-08-03 15:13:00 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-20 18:11:01 +0200 |
| commit | 452d2cd86a5690b00d51e572c2b38dcae840fd28 (patch) | |
| tree | ad424211a4bf15e262c32c13b15ab453eaaaa8d5 | |
| parent | f0d430ad5b94175a82e9e502a5683a4826f38e19 (diff) | |
| download | lwn-452d2cd86a5690b00d51e572c2b38dcae840fd28.tar.gz lwn-452d2cd86a5690b00d51e572c2b38dcae840fd28.zip | |
ALSA: hda: Fix krealloc() with __GFP_ZERO usage
commit 33baefe5e72f17a6df378e48196cd8cada11deec upstream.
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>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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; } |