From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Tue, 6 Apr 2010 11:12:21 +0000 (-0300)
Subject: V4L/DVB: video_ioctl2: do not replace arg with NULL for _IO() ioctls
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1d94aa369da073acff26fa98ad6b2168cb028ab1;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

V4L/DVB: video_ioctl2: do not replace arg with NULL for _IO() ioctls

If the ioctl was defined without direction (e.g. _IO('o', 25)), then
the arg as passed to vidioc_default was NULL instead of the original
argument.

Several ioctls in e.g. include/linux/dvb/video.h and audio.h use this type
of ioctl to pass simple numerical values to the driver.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 7d59c107f13b..d6975f9c3722 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -2006,7 +2006,7 @@ long video_ioctl2(struct file *file,
 {
 	char	sbuf[128];
 	void    *mbuf = NULL;
-	void	*parg = NULL;
+	void	*parg = (void *)arg;
 	long	err  = -EINVAL;
 	int     is_ext_ctrl;
 	size_t  ctrls_size = 0;