Hi Martin,

On Monday 19 September 2011 08:04:56 Martin Hostettler wrote:
> Ioctls on the subdevs node currently don't dispatch the register access
> debug driver callbacks. Add the dispatching with the same security checks
> are for non subdev video nodes (i.e. only capable(CAP_SYS_ADMIN may call
> the register access ioctls).
> 
> Sigend-off-by: Martin Hostettler <martin <at> neutronstar.dyndns.org>

I assume you mean Signed-off-by :-)

git commit -s avoid such mistakes.

Acked-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com>

> ---
>  drivers/media/video/v4l2-subdev.c |   19 +++++++++++++++++++
>  1 files changed, 19 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/media/video/v4l2-subdev.c
> b/drivers/media/video/v4l2-subdev.c index b7967c9..179e20e 100644
> --- a/drivers/media/video/v4l2-subdev.c
> +++ b/drivers/media/video/v4l2-subdev.c
> @@ -173,6 +173,25 @@ static long subdev_do_ioctl(struct file *file,
> unsigned int cmd, void *arg)
> 
>       case VIDIOC_UNSUBSCRIBE_EVENT:
>               return v4l2_subdev_call(sd, core, unsubscribe_event, vfh, arg);
> +
> +#ifdef CONFIG_VIDEO_ADV_DEBUG
> +     case VIDIOC_DBG_G_REGISTER:
> +     {
> +             struct v4l2_dbg_register *p = arg;
> +
> +             if (!capable(CAP_SYS_ADMIN))
> +                     return -EPERM;
> +             return v4l2_subdev_call(sd, core, g_register, p);
> +     }
> +     case VIDIOC_DBG_S_REGISTER:
> +     {
> +             struct v4l2_dbg_register *p = arg;
> +
> +             if (!capable(CAP_SYS_ADMIN))
> +                     return -EPERM;
> +             return v4l2_subdev_call(sd, core, s_register, p);
> +     }
> +#endif
>  #if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
>       case VIDIOC_SUBDEV_G_FMT: {
>               struct v4l2_subdev_format *format = arg;

-- 
Regards,

Laurent Pinchart
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to