Commit 181a4a2d authored Jan 30, 2018 by Hans Verkuil Committed by Mauro Carvalho Chehab Jan 30, 2018

media: v4l2-ioctl.c: don't copy back the result for -ENOTTY



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@cisco.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: <stable@vger.kernel.org>      # for v4.15 and up
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

parent b2469c81

drivers/media/v4l2-core/v4l2-ioctl.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message