ALSA: hda: Fix krealloc() with __GFP_ZERO usage
authorTakashi Iwai <tiwai@suse.de>
Wed, 3 Aug 2016 13:13:00 +0000 (15:13 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 3 Aug 2016 13:17:22 +0000 (15:17 +0200)
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>
sound/hda/array.c

index 516795baa7db60ad37aec14d4886b4ce5da4f78d..5dfa610e4471887c1c1570a61cd921c6493372de 100644 (file)
@@ -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;
        }