From: Hans Verkuil Date: Fri, 26 Jan 2018 08:24:53 +0000 (-0500) Subject: media: v4l2-compat-ioctl32.c: don't copy back the result for certain errors X-Git-Tag: v4.16-rc1~57^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d83a8243aaefe62ace433e4384a4f077bed86acb;p=thirdparty%2Fkernel%2Flinux.git media: v4l2-compat-ioctl32.c: don't copy back the result for certain errors Some ioctls need to copy back the result even if the ioctl returned an error. However, don't do this for the error code -ENOTTY. It makes no sense in that cases. Signed-off-by: Hans Verkuil Acked-by: Sakari Ailus Cc: # for v4.15 and up Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c index 7ee3777cbe9c1..3a1fca1440ace 100644 --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c @@ -968,6 +968,9 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar set_fs(old_fs); } + if (err == -ENOTTY) + return err; + /* Special case: even after an error we need to put the results back for these ioctls since the error_idx will contain information on which control failed. */