From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from www.linuxtv.org ([130.149.80.248]:42761 "EHLO www.linuxtv.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752001AbeA3MnQ (ORCPT ); Tue, 30 Jan 2018 07:43:16 -0500 From: Mauro Carvalho Chehab Date: Tue, 30 Jan 2018 12:23:04 +0000 Subject: [git:media_tree/master] media: v4l2-ioctl.c: don't copy back the result for -ENOTTY To: linuxtv-commits@linuxtv.org Cc: Sakari Ailus , stable@vger.kernel.org, Hans Verkuil Reply-to: linux-media@vger.kernel.org Message-Id: Sender: stable-owner@vger.kernel.org List-ID: This is an automatic generated email to let you know that the following patch were queued: Subject: media: v4l2-ioctl.c: don't copy back the result for -ENOTTY Author: Hans Verkuil Date: Tue Jan 30 03:50:01 2018 -0500 If the ioctl returned -ENOTTY, then don't bother copying back the result as there is no point. Signed-off-by: Hans Verkuil Acked-by: Sakari Ailus Cc: # for v4.15 and up Signed-off-by: Mauro Carvalho Chehab 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);