From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1906823-1518710617-2-4147593815120183293 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1518710617; b=DRRDNVy371L/yim+naY86sgz/gpvbweSZTVxy1QTMtuUKZC kyBIc6KTM0frj1F8x2sN8jHaTE9lfpv3+sRtDlliI+ddtyvOHJl6aM14rN5CxRmV lh0M/yHK7NLMcNB3BV3s43TnC5j8Qbml8l0NNA6uOduIODtBPNLLfZZ1z8NpImrm FyhxI36wifYsWg4ilrfKZFTqCeNc9Ge53VPZwf3OUPkOVUsVSLwV/9B/GfnecL1V F5VRQR/2T7Oh+7naFy2swEkVK0tpjERavpjWtvKtXndUal2O7FoSFLbz5k07YlVL 19ZGq93CiuQTjguQFuPfvxnUgI3GDZlfVIZo4Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=arctest; t=1518710617; bh=fd3tbxx322UnKoJ8Q3wUipw5sM bt6vi0pw0fQyawOwo=; b=Zct+2LEoImrFu1n1/wH4vKloVLYwpAptBGUdgnkFzX MPKkKSzlwQGT19gShqact62owjhrK10vat6Jdb2BpX9dynA24DwIaLcolwhyZB3d xUP7u9Cro7JFsYlnoEs4WRQTG9v+Gt1PmcWkNG0OsLrQFs3J3hwY7enynmo9mQJL FlTYfD3wdTKF0h+DLoreuqh0wsVy9zsHWFCD+zUJtKDtDIDYnibso+Xk2W6gw0U2 OznXfNo6+K0w+uVfkBt/9w29W8wx2jnJJPiZURECNL3ITifaivT1/FqYOF8QAThf DtPdKb2i9GxjxLjALce8EndGR+dURpRBIlTbFIBE2/Nw== ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes Authentication-Results: mx1.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424972AbeBOQDV (ORCPT ); Thu, 15 Feb 2018 11:03:21 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:35554 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1424672AbeBOPq0 (ORCPT ); Thu, 15 Feb 2018 10:46:26 -0500 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans Verkuil , Sakari Ailus , Mauro Carvalho Chehab Subject: [PATCH 4.15 124/202] media: v4l2-compat-ioctl32.c: dont copy back the result for certain errors Date: Thu, 15 Feb 2018 16:17:04 +0100 Message-Id: <20180215151719.731640760@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215151712.768794354@linuxfoundation.org> References: <20180215151712.768794354@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ 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: Greg Kroah-Hartman --- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 3 +++ 1 file changed, 3 insertions(+) --- 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 * 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. */