Merge tag 'media/v4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:

 - new CEC pin injection code for testing purposes

 - DVB frontend cxd2099 promoted from staging

 - new platform driver for Sony cxd2880 DVB devices

 - new sensor drivers: mt9t112, ov2685, ov5695, ov772x, tda1997x,
   tw9910.c

 - removal of unused cx18 and ivtv alsa mixers

 - the reneseas-ceu driver doesn't depend on soc_camera anymore and
   moved from staging

 - removed the mantis_vp3028 driver, unused since 2009

 - s5p-mfc: add support for version 10 of the MSP

 - added a decoder for imon protocol

 - atomisp: lots of cleanups

 - imx074 and mt9t031: don't depend on soc_camera anymore, being
   promoted from staging

 - added helper functions to better support DVB I2C binding

 - lots of driver improvements and cleanups

* tag 'media/v4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (438 commits)
  media: v4l2-ioctl: rename a temp var that stores _IOC_SIZE(cmd)
  media: fimc-capture: get rid of two warnings
  media: dvb-usb-v2: fix a missing dependency of I2C_MUX
  media: uvc: to the right check at uvc_ioctl_enum_framesizes()
  media: cec-core: fix a bug at cec_error_inj_write()
  media: tda9840: cleanup a warning
  media: tm6000:  avoid casting just to print pointer address
  media: em28xx-input: improve error handling code
  media: zr364xx: avoid casting just to print pointer address
  media: vivid-radio-rx: add a cast to avoid a warning
  media: saa7134-alsa: don't use casts to print a buffer address
  media: solo6x10: get rid of an address space warning
  media: zoran: don't cast pointers to print them
  media: ir-kbd-i2c: change the if logic to avoid a warning
  media: ir-kbd-i2c: improve error handling code
  media: saa7134-input: improve error handling
  media: s2255drv: fix a casting warning
  media: ivtvfb: Cleanup some warnings
  media: videobuf-dma-sg: Fix a weird cast
  soc_camera: fix a weird cast on printk
  ...

1 files changed, 50 insertions, 0 deletions

diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index c5639817db34..f9eed938d348 100644
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -187,27 +187,51 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
 
         switch (cmd) {
         case VIDIOC_QUERYCTRL:
+                /*
+                 * TODO: this really should be folded into v4l2_queryctrl (this
+                 * currently returns -EINVAL for NULL control handlers).
+                 * However, v4l2_queryctrl() is still called directly by
+                 * drivers as well and until that has been addressed I believe
+                 * it is safer to do the check here. The same is true for the
+                 * other control ioctls below.
+                 */
+                if (!vfh->ctrl_handler)
+                        return -ENOTTY;
                 return v4l2_queryctrl(vfh->ctrl_handler, arg);
 
         case VIDIOC_QUERY_EXT_CTRL:
+                if (!vfh->ctrl_handler)
+                        return -ENOTTY;
                 return v4l2_query_ext_ctrl(vfh->ctrl_handler, arg);
 
         case VIDIOC_QUERYMENU:
+                if (!vfh->ctrl_handler)
+                        return -ENOTTY;
                 return v4l2_querymenu(vfh->ctrl_handler, arg);
 
         case VIDIOC_G_CTRL:
+                if (!vfh->ctrl_handler)
+                        return -ENOTTY;
                 return v4l2_g_ctrl(vfh->ctrl_handler, arg);
 
         case VIDIOC_S_CTRL:
+                if (!vfh->ctrl_handler)
+                        return -ENOTTY;
                 return v4l2_s_ctrl(vfh, vfh->ctrl_handler, arg);
 
         case VIDIOC_G_EXT_CTRLS:
+                if (!vfh->ctrl_handler)
+                        return -ENOTTY;
                 return v4l2_g_ext_ctrls(vfh->ctrl_handler, arg);
 
         case VIDIOC_S_EXT_CTRLS:
+                if (!vfh->ctrl_handler)
+                        return -ENOTTY;
                 return v4l2_s_ext_ctrls(vfh, vfh->ctrl_handler, arg);
 
         case VIDIOC_TRY_EXT_CTRLS:
+                if (!vfh->ctrl_handler)
+                        return -ENOTTY;
                 return v4l2_try_ext_ctrls(vfh->ctrl_handler, arg);
 
         case VIDIOC_DQEVENT:
@@ -239,6 +263,19 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                         return -EPERM;
                 return v4l2_subdev_call(sd, core, s_register, p);
         }
+        case VIDIOC_DBG_G_CHIP_INFO:
+        {
+                struct v4l2_dbg_chip_info *p = arg;
+
+                if (p->match.type != V4L2_CHIP_MATCH_SUBDEV || p->match.addr)
+                        return -EINVAL;
+                if (sd->ops->core && sd->ops->core->s_register)
+                        p->flags |= V4L2_CHIP_FL_WRITABLE;
+                if (sd->ops->core && sd->ops->core->g_register)
+                        p->flags |= V4L2_CHIP_FL_READABLE;
+                strlcpy(p->name, sd->name, sizeof(p->name));
+                return 0;
+        }
 #endif
 
         case VIDIOC_LOG_STATUS: {
@@ -260,6 +297,8 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                 if (rval)
                         return rval;
 
+                memset(format->reserved, 0, sizeof(format->reserved));
+                memset(format->format.reserved, 0, sizeof(format->format.reserved));
                 return v4l2_subdev_call(sd, pad, get_fmt, subdev_fh->pad, format);
         }
 
@@ -270,6 +309,8 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                 if (rval)
                         return rval;
 
+                memset(format->reserved, 0, sizeof(format->reserved));
+                memset(format->format.reserved, 0, sizeof(format->format.reserved));
                 return v4l2_subdev_call(sd, pad, set_fmt, subdev_fh->pad, format);
         }
 
@@ -281,6 +322,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                 if (rval)
                         return rval;
 
+                memset(crop->reserved, 0, sizeof(crop->reserved));
                 memset(&sel, 0, sizeof(sel));
                 sel.which = crop->which;
                 sel.pad = crop->pad;
@@ -298,6 +340,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                 struct v4l2_subdev_crop *crop = arg;
                 struct v4l2_subdev_selection sel;
 
+                memset(crop->reserved, 0, sizeof(crop->reserved));
                 rval = check_crop(sd, crop);
                 if (rval)
                         return rval;
@@ -326,6 +369,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                 if (code->pad >= sd->entity.num_pads)
                         return -EINVAL;
 
+                memset(code->reserved, 0, sizeof(code->reserved));
                 return v4l2_subdev_call(sd, pad, enum_mbus_code, subdev_fh->pad,
                                         code);
         }
@@ -340,6 +384,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                 if (fse->pad >= sd->entity.num_pads)
                         return -EINVAL;
 
+                memset(fse->reserved, 0, sizeof(fse->reserved));
                 return v4l2_subdev_call(sd, pad, enum_frame_size, subdev_fh->pad,
                                         fse);
         }
@@ -350,6 +395,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                 if (fi->pad >= sd->entity.num_pads)
                         return -EINVAL;
 
+                memset(fi->reserved, 0, sizeof(fi->reserved));
                 return v4l2_subdev_call(sd, video, g_frame_interval, arg);
         }
 
@@ -359,6 +405,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                 if (fi->pad >= sd->entity.num_pads)
                         return -EINVAL;
 
+                memset(fi->reserved, 0, sizeof(fi->reserved));
                 return v4l2_subdev_call(sd, video, s_frame_interval, arg);
         }
 
@@ -372,6 +419,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                 if (fie->pad >= sd->entity.num_pads)
                         return -EINVAL;
 
+                memset(fie->reserved, 0, sizeof(fie->reserved));
                 return v4l2_subdev_call(sd, pad, enum_frame_interval, subdev_fh->pad,
                                         fie);
         }
@@ -383,6 +431,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                 if (rval)
                         return rval;
 
+                memset(sel->reserved, 0, sizeof(sel->reserved));
                 return v4l2_subdev_call(
                         sd, pad, get_selection, subdev_fh->pad, sel);
         }
@@ -394,6 +443,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                 if (rval)
                         return rval;
 
+                memset(sel->reserved, 0, sizeof(sel->reserved));
                 return v4l2_subdev_call(
                         sd, pad, set_selection, subdev_fh->pad, sel);
         }