Received: by 10.213.65.68 with SMTP id h4csp707145imn; Wed, 28 Mar 2018 11:17:37 -0700 (PDT) X-Google-Smtp-Source: AIpwx48s1pxkhCm9K6IV5HHfj+ke+U0/fKIrNndRuWhYGK8WOCo3lNODzBF/+QRkll+KX7N1qL2o X-Received: by 2002:a17:902:6b02:: with SMTP id o2-v6mr4931356plk.334.1522261057192; Wed, 28 Mar 2018 11:17:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522261057; cv=none; d=google.com; s=arc-20160816; b=rYHwye3dXFdX6XCWoKghNPCY4xxXUZXmOZBdQisyfJV5CfWd074Nv17b7NO69sicqe m74W1+cZ2TULU9Uo+FEoscSRvZLwPe7c4ubhCfIfD1d9D1vKJsnjgapnIxPFYCBDFoq0 somW7XfFN+U+7HtnPNlTvmk3c3Q1+/bdmXSw7mFyF/iuRCVQVWOZ0AVUYMKYLxxqMVJp 6fZHOU7JxgaR0BIoN8RWpCvXOymin1qs391ydN57jF551jsUOSaFycFKdSicjveavSil xqAj3Ly4h9f3WNw552F/5VTZQPBvYgi3OPasYqZuewQ+32plEiwFfp1gCPW3ZPEWYONk /ruA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=0mmn0rDTWTuXU0HdamFDLi+XIwLp+TwVcZA6BsUc2HQ=; b=f+PS9plimW7p8YwdM5QE8q2YkSB5pelicFYszjlteacsrNv1ZcAVkAxjkiYDchCQkW 18SQ5u/Pa09njVV8jxVY0YfGO05IoB8L0uEh95gg5Kv/csfQY1KvJRm7QSz8/GM245ig RViUf6sZgOhSADJ/46F+nlGXMBluapGWPztOvkNd5nJOc7bsKNbhjmukNaJlIa7n2YTe BJL+z4RKKQWT9NnBh/VpHiGZQE1hk45YTCLBoBoCTdhzSR+yb4uYQrtuHUjJCAG294Xa YNoi7C9uuMxMGBGZrS3I++dI8r2f2E7HqS04f1FggKl7KmzzH07CEyfC6hfoqIkHzylN M5mQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y62si2278603pfd.309.2018.03.28.11.17.22; Wed, 28 Mar 2018 11:17:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753555AbeC1SNJ (ORCPT + 99 others); Wed, 28 Mar 2018 14:13:09 -0400 Received: from osg.samsung.com ([64.30.133.232]:59787 "EHLO osg.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752995AbeC1SNF (ORCPT ); Wed, 28 Mar 2018 14:13:05 -0400 Received: from localhost (localhost [127.0.0.1]) by osg.samsung.com (Postfix) with ESMTP id 6A7293B54F; Wed, 28 Mar 2018 11:13:04 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at dev.s-opensource.com X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from osg.samsung.com ([127.0.0.1]) by localhost (localhost [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DyMwJhyAOdEq; Wed, 28 Mar 2018 11:12:57 -0700 (PDT) Received: from smtp.s-opensource.com (177.205.88.90.dynamic.adsl.gvt.net.br [177.205.88.90]) by osg.samsung.com (Postfix) with ESMTPSA id C8AC13B4D9; Wed, 28 Mar 2018 11:12:40 -0700 (PDT) Received: from mchehab by smtp.s-opensource.com with local (Exim 4.90_1) (envelope-from ) id 1f1FYs-0005Jq-Eg; Wed, 28 Mar 2018 15:12:38 -0300 From: Mauro Carvalho Chehab To: Linux Media Mailing List , stable@vger.kernel.org Cc: Hans Verkuil , Mauro Carvalho Chehab , Linux Kernel Mailing List , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH for v3.18 13/18] media: v4l2-compat-ioctl32.c: don't copy back the result for certain errors Date: Wed, 28 Mar 2018 15:12:32 -0300 Message-Id: <9d0bb62c2dc7caee1fd2b9199fc1a22ec8479395.1522260310.git.mchehab@s-opensource.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans Verkuil commit d83a8243aaefe62ace433e4384a4f077bed86acb upstream. 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 Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c index a5f74a508f58..9e5807842dad 100644 --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c @@ -943,6 +943,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. */ -- 2.14.3