1 files changed, 12 insertions, 73 deletions

diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
index 55c26e7d370e..f3bed37859a2 100644
--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
@@ -38,18 +38,13 @@
  * data to the routine.
  */
 
-struct v4l2_clip32 {
-	struct v4l2_rect        c;
-	compat_caddr_t		next;
-};
-
 struct v4l2_window32 {
 	struct v4l2_rect        w;
 	__u32			field;	/* enum v4l2_field */
 	__u32			chromakey;
-	compat_caddr_t		clips; /* actually struct v4l2_clip32 * */
-	__u32			clipcount;
-	compat_caddr_t		bitmap;
+	compat_caddr_t		clips; /* always NULL */
+	__u32			clipcount; /* always 0 */
+	compat_caddr_t		bitmap; /* always NULL */
 	__u8                    global_alpha;
 };
 
@@ -65,17 +60,12 @@ static int get_v4l2_window32(struct v4l2_window *p64,
 		.w		= w32.w,
 		.field		= w32.field,
 		.chromakey	= w32.chromakey,
-		.clips		= (void __force *)compat_ptr(w32.clips),
-		.clipcount	= w32.clipcount,
-		.bitmap		= compat_ptr(w32.bitmap),
+		.clips		= NULL,
+		.clipcount	= 0,
+		.bitmap		= NULL,
 		.global_alpha	= w32.global_alpha,
 	};
 
-	if (p64->clipcount > 2048)
-		return -EINVAL;
-	if (!p64->clipcount)
-		p64->clips = NULL;
-
 	return 0;
 }
 
@@ -89,16 +79,13 @@ static int put_v4l2_window32(struct v4l2_window *p64,
 		.w		= p64->w,
 		.field		= p64->field,
 		.chromakey	= p64->chromakey,
-		.clips		= (uintptr_t)p64->clips,
-		.clipcount	= p64->clipcount,
-		.bitmap		= ptr_to_compat(p64->bitmap),
+		.clips		= 0,
+		.clipcount	= 0,
+		.bitmap		= 0,
 		.global_alpha	= p64->global_alpha,
 	};
 
-	/* copy everything except the clips pointer */
-	if (copy_to_user(p32, &w32, offsetof(struct v4l2_window32, clips)) ||
-	    copy_to_user(&p32->clipcount, &w32.clipcount,
-			 sizeof(w32) - offsetof(struct v4l2_window32, clipcount)))
+	if (copy_to_user(p32, &w32, sizeof(w32)))
 		return -EFAULT;
 
 	return 0;
@@ -600,14 +587,11 @@ struct v4l2_framebuffer32 {
 static int get_v4l2_framebuffer32(struct v4l2_framebuffer *p64,
 				  struct v4l2_framebuffer32 __user *p32)
 {
-	compat_caddr_t tmp;
-
-	if (get_user(tmp, &p32->base) ||
-	    get_user(p64->capability, &p32->capability) ||
+	if (get_user(p64->capability, &p32->capability) ||
 	    get_user(p64->flags, &p32->flags) ||
 	    copy_from_user(&p64->fmt, &p32->fmt, sizeof(p64->fmt)))
 		return -EFAULT;
-	p64->base = (void __force *)compat_ptr(tmp);
+	p64->base = NULL;
 
 	return 0;
 }
@@ -1043,29 +1027,6 @@ int v4l2_compat_get_array_args(struct file *file, void *mbuf,
 	memset(mbuf, 0, array_size);
 
 	switch (cmd) {
-	case VIDIOC_G_FMT32:
-	case VIDIOC_S_FMT32:
-	case VIDIOC_TRY_FMT32: {
-		struct v4l2_format *f64 = arg;
-		struct v4l2_clip *c64 = mbuf;
-		struct v4l2_clip32 __user *c32 = user_ptr;
-		u32 clipcount = f64->fmt.win.clipcount;
-
-		if ((f64->type != V4L2_BUF_TYPE_VIDEO_OVERLAY &&
-		     f64->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY) ||
-		    clipcount == 0)
-			return 0;
-		if (clipcount > 2048)
-			return -EINVAL;
-		while (clipcount--) {
-			if (copy_from_user(c64, c32, sizeof(c64->c)))
-				return -EFAULT;
-			c64->next = NULL;
-			c64++;
-			c32++;
-		}
-		break;
-	}
 #ifdef CONFIG_COMPAT_32BIT_TIME
 	case VIDIOC_QUERYBUF32_TIME32:
 	case VIDIOC_QBUF32_TIME32:
@@ -1136,28 +1097,6 @@ int v4l2_compat_put_array_args(struct file *file, void __user *user_ptr,
 	int err = 0;
 
 	switch (cmd) {
-	case VIDIOC_G_FMT32:
-	case VIDIOC_S_FMT32:
-	case VIDIOC_TRY_FMT32: {
-		struct v4l2_format *f64 = arg;
-		struct v4l2_clip *c64 = mbuf;
-		struct v4l2_clip32 __user *c32 = user_ptr;
-		u32 clipcount = f64->fmt.win.clipcount;
-
-		if ((f64->type != V4L2_BUF_TYPE_VIDEO_OVERLAY &&
-		     f64->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY) ||
-		    clipcount == 0)
-			return 0;
-		if (clipcount > 2048)
-			return -EINVAL;
-		while (clipcount--) {
-			if (copy_to_user(c32, c64, sizeof(c64->c)))
-				return -EFAULT;
-			c64++;
-			c32++;
-		}
-		break;
-	}
 #ifdef CONFIG_COMPAT_32BIT_TIME
 	case VIDIOC_QUERYBUF32_TIME32:
 	case VIDIOC_QBUF32_TIME32: