diff options
author | Takashi Iwai <tiwai@suse.de> | 2016-08-03 09:13:00 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-08-03 09:17:22 -0400 |
commit | 33baefe5e72f17a6df378e48196cd8cada11deec (patch) | |
tree | 6f2130f7a16d17dd21719563144aadc59d6f7ec1 /sound | |
parent | fd48331f9b71d2add941adaee3619f5b8527182d (diff) |
ALSA: hda: Fix krealloc() with __GFP_ZERO usage
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>
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) | |||
21 | return NULL; | 21 | return NULL; |
22 | if (array->used >= array->alloced) { | 22 | if (array->used >= array->alloced) { |
23 | int num = array->alloced + array->alloc_align; | 23 | int num = array->alloced + array->alloc_align; |
24 | int oldsize = array->alloced * array->elem_size; | ||
24 | int size = (num + 1) * array->elem_size; | 25 | int size = (num + 1) * array->elem_size; |
25 | void *nlist; | 26 | void *nlist; |
26 | if (snd_BUG_ON(num >= 4096)) | 27 | if (snd_BUG_ON(num >= 4096)) |
27 | return NULL; | 28 | return NULL; |
28 | nlist = krealloc(array->list, size, GFP_KERNEL | __GFP_ZERO); | 29 | nlist = krealloc(array->list, size, GFP_KERNEL); |
29 | if (!nlist) | 30 | if (!nlist) |
30 | return NULL; | 31 | return NULL; |
32 | memset(nlist + oldsize, 0, size - oldsize); | ||
31 | array->list = nlist; | 33 | array->list = nlist; |
32 | array->alloced = num; | 34 | array->alloced = num; |
33 | } | 35 | } |