media: v4l2-compat-ioctl32.c: drop pr_info for unknown buffer type 87/175687/1
authorHans Verkuil <hans.verkuil@cisco.com>
Wed, 28 Mar 2018 18:12:31 +0000 (15:12 -0300)
committerSeung-Woo Kim <sw0312.kim@samsung.com>
Wed, 11 Apr 2018 11:56:51 +0000 (20:56 +0900)
commit 169f24ca68bf0f247d111aef07af00dd3a02ae88 upstream.

There is nothing wrong with using an unknown buffer type. So
stop spamming the kernel log whenever this happens. The kernel
will just return -EINVAL to signal this.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[sw0312.kim: cherry-pick from linux-3.18.y to apply CVE patch]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Change-Id: I6d4c1415da97ddd04dbc06016cc44658c8e88478

drivers/media/v4l2-core/v4l2-compat-ioctl32.c

index 27959ee1107aa5186f50e0fdd40ad2c1d7e58df3..d8a2c755cd8005b1dc3aa000594d25d566b705f2 100644 (file)
@@ -170,8 +170,6 @@ static int __get_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __us
                return copy_from_user(&kp->fmt.sliced, &up->fmt.sliced,
                                      sizeof(kp->fmt.sliced)) ? -EFAULT : 0;
        default:
-               printk(KERN_INFO "compat_ioctl32: unexpected VIDIOC_FMT type %d\n",
-                      kp->type);
                return -EINVAL;
        }
 }
@@ -214,8 +212,6 @@ static int __put_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __us
                return copy_to_user(&up->fmt.sliced, &kp->fmt.sliced,
                                    sizeof(kp->fmt.sliced)) ?  -EFAULT : 0;
        default:
-               printk(KERN_INFO "compat_ioctl32: unexpected VIDIOC_FMT type %d\n",
-                      kp->type);
                return -EINVAL;
        }
 }