patch-2.4.8 linux/drivers/media/video/zr36067.c

Next file: linux/drivers/net/arlan.c
Previous file: linux/drivers/media/video/tvaudio.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.7/linux/drivers/media/video/zr36067.c linux/drivers/media/video/zr36067.c
@@ -50,7 +50,7 @@
 #include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/major.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/pci.h>
 #include <linux/signal.h>
@@ -3752,6 +3752,9 @@
 			/*
 			 *   Write the overlay mask if clips are wanted.
 			 */
+			 
+			if (vw.clipcount > 2048)
+				return -EINVAL;
 			if (vw.clipcount) {
 				vcp =
 				    vmalloc(sizeof(struct video_clip) *

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)