From patchwork Fri Sep 22 14:22:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 725695 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F2BCE6FE38 for ; Fri, 22 Sep 2023 14:23:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234281AbjIVOXY (ORCPT ); Fri, 22 Sep 2023 10:23:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234289AbjIVOXX (ORCPT ); Fri, 22 Sep 2023 10:23:23 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C55D195 for ; Fri, 22 Sep 2023 07:23:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695392596; x=1726928596; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kVOii1f/5s2PJ8KVti6PipXSxyHHcLq5+5oOMw3hR+A=; b=eIQu8C1voXn+VLG4PWi6oFET1JESawIbkcJscOq/dITPej6OiIcjEh69 XrQT5ZjjjgsmPf7qLLGqeg8N/4/Ai0Ap4poolsooNtjoraYRy8z6d28aQ hu4BskkGSXYzfSfZVna3aQTqNXXcxUtBwPqTbYnbINmv42wvKp0ytu2U7 1q5wZhVIJ4Vfa6g4Uo2sJf/RJ6/3OQEaxEswrzBjREwRmb1ds0ISZiYtN tAApdF9OpA/o7Eps0B7/WtxJznsDdSPzcMt+x2eWkomoEVvEkkCHK1EH1 /aYMRoXBxIJkQj6eWIo7akRDRb9v29lyI+DyAha3o3pUR+vbdYH4qsAv3 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10841"; a="360218999" X-IronPort-AV: E=Sophos;i="6.03,167,1694761200"; d="scan'208";a="360218999" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2023 07:23:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10841"; a="741112522" X-IronPort-AV: E=Sophos;i="6.03,167,1694761200"; d="scan'208";a="741112522" Received: from turnipsi.fi.intel.com (HELO kekkonen.fi.intel.com) ([10.237.72.44]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2023 07:23:13 -0700 Received: from svinhufvud.ger.corp.intel.com (localhost [IPv6:::1]) by kekkonen.fi.intel.com (Postfix) with ESMTP id 2F4B61209A1; Fri, 22 Sep 2023 17:23:10 +0300 (EEST) From: Sakari Ailus To: linux-media@vger.kernel.org Cc: Laurent Pinchart , tomi.valkeinen@ideasonboard.com, bingbu.cao@intel.com, hongju.wang@intel.com, hverkuil@xs4all.nl, Andrey Konovalov , Jacopo Mondi , Dmitry Perchanov , "Ng, Khai Wen" Subject: [PATCH v4 18/23] media: v4l: subdev: Copy argument back to user also for S_ROUTING Date: Fri, 22 Sep 2023 17:22:34 +0300 Message-Id: <20230922142239.259425-19-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230922142239.259425-1-sakari.ailus@linux.intel.com> References: <20230922142239.259425-1-sakari.ailus@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org As the user needs to know what went wrong for S_ROUTING, copy array arguments back to the user. Signed-off-by: Sakari Ailus --- drivers/media/v4l2-core/v4l2-ioctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index fb453b7d0c91..6921a72566df 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -3419,7 +3419,8 @@ video_usercopy(struct file *file, unsigned int orig_cmd, unsigned long arg, * in case of failure, but it is not defined here as part of the * 'v4l2_ioctls' array, insert an ad-hoc check to address that. */ - if (err < 0 && !always_copy && cmd != VIDIOC_SUBDEV_G_ROUTING) + if (err < 0 && !always_copy && cmd != VIDIOC_SUBDEV_G_ROUTING && + cmd != VIDIOC_SUBDEV_S_ROUTING) goto out; if (has_array_args) {