patch-2.4.8 linux/drivers/usb/ibmcam.c

• Lines: 31
• Date: Tue Jul 24 14:20:56 2001
• Orig file: v2.4.7/linux/drivers/usb/ibmcam.c
• Orig date: Tue Jul 3 17:08:21 2001

diff -u --recursive --new-file v2.4.7/linux/drivers/usb/ibmcam.c linux/drivers/usb/ibmcam.c
@@ -2591,11 +2591,11 @@
 		{
 			struct video_window vw;
 
+			memset(&vw, 0, sizeof(vw));
 			vw.x = 0;
 			vw.y = 0;
 			vw.width = imgwidth;
 			vw.height = imgheight;
-			vw.chromakey = 0;
 			vw.flags = usb_ibmcam_calculate_fps();
 
 			if (copy_to_user(arg, &vw, sizeof(vw)))
@@ -2658,6 +2658,11 @@
 			if (copy_from_user((void *)&frame, arg, sizeof(int)))
 				return -EFAULT;
 
+			if ((unsigned)frame >= IBMCAM_NUMFRAMES) {
+				err("VIDIOCSYNC: invalid frame %d.", frame);
+				return -EINVAL;
+			}
+
 			if (debug >= 1)
 				printk(KERN_DEBUG "ibmcam: syncing to frame %d\n", frame);
 
@@ -3161,5 +3166,3 @@
 
 MODULE_AUTHOR( DRIVER_AUTHOR );
 MODULE_DESCRIPTION( DRIVER_DESC );
-
-