* [PATCH 1/1] v4l: subdev: Check for pads in [gs]_frame_interval
@ 2013-10-17 8:15 Sakari Ailus
2013-11-01 17:31 ` Sylwester Nawrocki
0 siblings, 1 reply; 2+ messages in thread
From: Sakari Ailus @ 2013-10-17 8:15 UTC (permalink / raw)
To: linux-media
The validity of the pad field in struct v4l2_subdev_frame_interval was not
ensured by the V4L2 subdev IOCTL helper. Fix this.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/v4l2-core/v4l2-subdev.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index 996c248..3fa1907 100644
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -305,11 +305,23 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
fse);
}
- case VIDIOC_SUBDEV_G_FRAME_INTERVAL:
+ case VIDIOC_SUBDEV_G_FRAME_INTERVAL: {
+ struct v4l2_subdev_frame_interval *fi = arg;
+
+ if (fi->pad >= sd->entity.num_pads)
+ return -EINVAL;
+
return v4l2_subdev_call(sd, video, g_frame_interval, arg);
+ }
+
+ case VIDIOC_SUBDEV_S_FRAME_INTERVAL: {
+ struct v4l2_subdev_frame_interval *fi = arg;
+
+ if (fi->pad >= sd->entity.num_pads)
+ return -EINVAL;
- case VIDIOC_SUBDEV_S_FRAME_INTERVAL:
return v4l2_subdev_call(sd, video, s_frame_interval, arg);
+ }
case VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL: {
struct v4l2_subdev_frame_interval_enum *fie = arg;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1] v4l: subdev: Check for pads in [gs]_frame_interval
2013-10-17 8:15 [PATCH 1/1] v4l: subdev: Check for pads in [gs]_frame_interval Sakari Ailus
@ 2013-11-01 17:31 ` Sylwester Nawrocki
0 siblings, 0 replies; 2+ messages in thread
From: Sylwester Nawrocki @ 2013-11-01 17:31 UTC (permalink / raw)
To: Sakari Ailus; +Cc: linux-media
Hi Sakari,
On 10/17/2013 10:15 AM, Sakari Ailus wrote:
> The validity of the pad field in struct v4l2_subdev_frame_interval was not
> ensured by the V4L2 subdev IOCTL helper. Fix this.
>
> Signed-off-by: Sakari Ailus<sakari.ailus@linux.intel.com>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Regards,
Sylwester
> ---
> drivers/media/v4l2-core/v4l2-subdev.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
> index 996c248..3fa1907 100644
> --- a/drivers/media/v4l2-core/v4l2-subdev.c
> +++ b/drivers/media/v4l2-core/v4l2-subdev.c
> @@ -305,11 +305,23 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
> fse);
> }
>
> - case VIDIOC_SUBDEV_G_FRAME_INTERVAL:
> + case VIDIOC_SUBDEV_G_FRAME_INTERVAL: {
> + struct v4l2_subdev_frame_interval *fi = arg;
> +
> + if (fi->pad>= sd->entity.num_pads)
> + return -EINVAL;
> +
> return v4l2_subdev_call(sd, video, g_frame_interval, arg);
> + }
> +
> + case VIDIOC_SUBDEV_S_FRAME_INTERVAL: {
> + struct v4l2_subdev_frame_interval *fi = arg;
> +
> + if (fi->pad>= sd->entity.num_pads)
> + return -EINVAL;
>
> - case VIDIOC_SUBDEV_S_FRAME_INTERVAL:
> return v4l2_subdev_call(sd, video, s_frame_interval, arg);
> + }
>
> case VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL: {
> struct v4l2_subdev_frame_interval_enum *fie = arg;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-11-01 17:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-17 8:15 [PATCH 1/1] v4l: subdev: Check for pads in [gs]_frame_interval Sakari Ailus
2013-11-01 17:31 ` Sylwester Nawrocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).