Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
sound
/
hda
/
array.c
diff --git
a/kernel/sound/hda/array.c
b/kernel/sound/hda/array.c
index
516795b
..
5dfa610
100644
(file)
--- a/
kernel/sound/hda/array.c
+++ b/
kernel/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;
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;
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;
if (!nlist)
return NULL;
+ memset(nlist + oldsize, 0, size - oldsize);
array->list = nlist;
array->alloced = num;
}
array->list = nlist;
array->alloced = num;
}