From: Hans Verkuil 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-Tag: firefly_0821_release~9833^2~2094^2~216 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1d94aa369da073acff26fa98ad6b2168cb028ab1;p=firefly-linux-kernel-4.4.55.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 Signed-off-by: Mauro Carvalho Chehab --- 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;