| Message ID | 20190512201551.18724-3-jmkrzyszt@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: v4l2-subdev: Verify arguments in v4l2_subdev_call() | expand |
On 5/12/19 10:15 PM, Janusz Krzysztofik wrote: > Invalid arguments passed to v4l2_subdev_call generally mean bugs. Be > noisy if that happens. > > Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> > --- > drivers/media/v4l2-core/v4l2-subdev.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c > index 890916674d42..5f2264575cd7 100644 > --- a/drivers/media/v4l2-core/v4l2-subdev.c > +++ b/drivers/media/v4l2-core/v4l2-subdev.c > @@ -122,8 +122,8 @@ static int subdev_close(struct file *file) > > static int check_which(__u32 which) > { > - if (which != V4L2_SUBDEV_FORMAT_TRY && > - which != V4L2_SUBDEV_FORMAT_ACTIVE) > + if (WARN_ON(which != V4L2_SUBDEV_FORMAT_TRY && > + which != V4L2_SUBDEV_FORMAT_ACTIVE)) > return -EINVAL; But this is now also called when the user calls an ioctl. And in that case there should be no warning. It's perfectly legal for userspace to specify a random value for which, and in that case it is just a regular userspace bug. Same for the other checks below. Regards, Hans > > return 0; > @@ -132,7 +132,7 @@ static int check_which(__u32 which) > static int check_pad(struct v4l2_subdev *sd, __u32 pad) > { > #if defined(CONFIG_MEDIA_CONTROLLER) > - if (sd->entity.num_pads && pad >= sd->entity.num_pads) > + if (WARN_ON(sd->entity.num_pads && pad >= sd->entity.num_pads)) > return -EINVAL; > #endif > return 0; > @@ -228,7 +228,7 @@ static int check_set_selection(struct v4l2_subdev *sd, > > static int check_edid(struct v4l2_subdev *sd, struct v4l2_subdev_edid *edid) > { > - if (edid->blocks && edid->edid == NULL) > + if (WARN_ON(edid->blocks && edid->edid == NULL)) > return -EINVAL; > > return check_pad(sd, edid->pad); >
diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index 890916674d42..5f2264575cd7 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -122,8 +122,8 @@ static int subdev_close(struct file *file) static int check_which(__u32 which) { - if (which != V4L2_SUBDEV_FORMAT_TRY && - which != V4L2_SUBDEV_FORMAT_ACTIVE) + if (WARN_ON(which != V4L2_SUBDEV_FORMAT_TRY && + which != V4L2_SUBDEV_FORMAT_ACTIVE)) return -EINVAL; return 0; @@ -132,7 +132,7 @@ static int check_which(__u32 which) static int check_pad(struct v4l2_subdev *sd, __u32 pad) { #if defined(CONFIG_MEDIA_CONTROLLER) - if (sd->entity.num_pads && pad >= sd->entity.num_pads) + if (WARN_ON(sd->entity.num_pads && pad >= sd->entity.num_pads)) return -EINVAL; #endif return 0; @@ -228,7 +228,7 @@ static int check_set_selection(struct v4l2_subdev *sd, static int check_edid(struct v4l2_subdev *sd, struct v4l2_subdev_edid *edid) { - if (edid->blocks && edid->edid == NULL) + if (WARN_ON(edid->blocks && edid->edid == NULL)) return -EINVAL; return check_pad(sd, edid->pad);
Invalid arguments passed to v4l2_subdev_call generally mean bugs. Be noisy if that happens. Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> --- drivers/media/v4l2-core/v4l2-subdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)