---

yaml --- r: 120439 b: refs/heads/master c: b910d9a h: refs/heads/master i: 120437: 774d18b 120435: 53ce93f 120431: 67a98c0 v: v3
git-mirror · Nov 6, 2008 · 78b2feb · 78b2feb
1 parent c5ed3e2
commit 78b2feb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c217429b14708999d6ac5de964c452600e8797d3
+refs/heads/master: b910d9ae5b370cf5bf9d6a71028119861b6ea8a4
diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c
@@ -3399,7 +3399,10 @@ void *snd_array_new(struct snd_array *array)
 {
 	if (array->used >= array->alloced) {
 		int num = array->alloced + array->alloc_align;
-		void *nlist = kcalloc(num + 1, array->elem_size, GFP_KERNEL);
+		void *nlist;
+		if (snd_BUG_ON(num >= 4096))
+			return NULL;
+		nlist = kcalloc(num + 1, array->elem_size, GFP_KERNEL);
 		if (!nlist)
 			return NULL;
 		if (array->list) {