diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-08-03 15:13:00 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-11-20 01:17:04 +0000 |
| commit | 151ff7c687be4268a9cd591aa2aa35004dae0c61 (patch) | |
| tree | 5ba279c08a3d89f703d1650944b76ff736668d98 /sound | |
| parent | 08397b1a5cd433944e424de2be1f92eefb3836c2 (diff) | |
| download | linux-stable-151ff7c687be4268a9cd591aa2aa35004dae0c61.tar.gz linux-stable-151ff7c687be4268a9cd591aa2aa35004dae0c61.tar.bz2 linux-stable-151ff7c687be4268a9cd591aa2aa35004dae0c61.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>
[bwh: Backported to 3.16: adjust filename]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 68bea67c3ca3..22b7038cff0d 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -5793,13 +5793,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; } |