On Tue, Jan 30, 2018 at 11:26:51AM +0100, Hans Verkuil wrote:
> From: Hans Verkuil <hans.verkuil@xxxxxxxxx>
>
> If the ioctl returned -ENOTTY, then don't bother copying
> back the result as there is no point.
>
> Signed-off-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
> Cc: <stable@xxxxxxxxxxxxxxx> # for v4.15 and up
Acked-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
> ---
> drivers/media/v4l2-core/v4l2-ioctl.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
> index c7f6b65d3ad7..260288ca4f55 100644
> --- a/drivers/media/v4l2-core/v4l2-ioctl.c
> +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
> @@ -2900,8 +2900,11 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
>
> /* Handles IOCTL */
> err = func(file, cmd, parg);
> - if (err == -ENOIOCTLCMD)
> + if (err == -ENOTTY || err == -ENOIOCTLCMD) {
> err = -ENOTTY;
> + goto out;
> + }
> +
> if (err == 0) {
> if (cmd == VIDIOC_DQBUF)
> trace_v4l2_dqbuf(video_devdata(file)->minor, parg);
> --
> 2.15.1
>
--
Sakari Ailus
e-mail: sakari.ailus@xxxxxx