---

yaml --- r: 333850 b: refs/heads/master c: 1b8b10c h: refs/heads/master v: v3
git-mirror · Oct 7, 2012 · 12ebdbc · 12ebdbc
1 parent 817d04f
commit 12ebdbc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a18382c3196978164f0f6290aac98f2f6f43c00
+refs/heads/master: 1b8b10cc7e6bd9bf017c58e32b1e7f632e23850d
diff --git a/trunk/drivers/media/v4l2-core/v4l2-ioctl.c b/trunk/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -2212,6 +2212,10 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
 		struct v4l2_subdev_edid *edid = parg;
 
 		if (edid->blocks) {
+			if (edid->blocks > 256) {
+				ret = -EINVAL;
+				break;
+			}
 			*user_ptr = (void __user *)edid->edid;
 			*kernel_ptr = (void *)&edid->edid;
 			*array_size = edid->blocks * 128;