From patchwork Thu Jun 10 21:43:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 457875 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp13799jae; Thu, 10 Jun 2021 14:45:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZHhneqsK2H3S7cAsBQroniwKt1BbPUpm5bWJcBm4jJ4KKeOUUBRqdT0dNkOQc/RgtcFFj X-Received: by 2002:a05:6402:1153:: with SMTP id g19mr493097edw.179.1623361543338; Thu, 10 Jun 2021 14:45:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623361543; cv=none; d=google.com; s=arc-20160816; b=BmtrgwDm5KKT2Vxz4rVa8D6u4Nh/FrNl9Wami1xAKUN8itdOCgWS2eAgtI9yrTMgYA BAK1M33wmcG9tzn3Gsu2olsdXZSD7MHHHf/IemSTtuxQcFRzWk/L8qMjBNezgfzNYdUq 17vjLx+sVILP/+926dS6Qt/fuT+cFxa7+QFrLr7BbJtl4CJ+lRhopTPAUYG31R0vnBw5 /WPxqfFRNCtpcLodOgZQJ88uD1lAMzpb3ccp5064dIx43qEN35uW6dnFjpLsgVhxAFw1 qhJc2S8MRQusvQlF+CY7h9j/C4zc1EmxawLkvik/NEKHG4vOezJLN413oDJ+YjWT3DQE 6EmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OwmjgXgukGoh1fX9/5HKuNsaaNnUgqthWFLuH8Jg6zg=; b=p5Iy14o56e/3ujivNRdwd0S6Onp6WDAjlOSFOP4jQUiiwii5HfPO06k6aU2LsTuJ50 b56KAYXFhS0CMFIH8fdQCJTPdrfgpApJSIqjKbz2IgYWNPsjgFigBPkKnCwcb6xmaTKT LnUNp/i5PtMnHROnsh7rTzgnxDb4Pu2qz0Jyw3A55UoGjNlPo/qbnUdsSKlhAUcXvo4h 62azJwvo07AuS1KLUykw0bKUEA5V/Jttir6S9Oc2JODAvtJ1Cw1C3Sfc1Cg+VR+In/QV YEjh6j0pI1k6ryQ+Xp/k5+/L4N8aYMaAmZCmN5C9uzSIngvHhDc/9cWb5JQGLpf2FTSu +giQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IqGg0QY8; spf=pass (google.com: domain of linux-media-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-media-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j6si3052531edv.294.2021.06.10.14.45.43; Thu, 10 Jun 2021 14:45:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-media-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IqGg0QY8; spf=pass (google.com: domain of linux-media-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-media-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231165AbhFJVrL (ORCPT + 4 others); Thu, 10 Jun 2021 17:47:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:54422 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231133AbhFJVrH (ORCPT ); Thu, 10 Jun 2021 17:47:07 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AAC1F6140F; Thu, 10 Jun 2021 21:45:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623361510; bh=tz069tuRpzth1vlbMNt9axrP0H788thSG4v+resSSzw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IqGg0QY8sX1gf0wW5kx1E6zk593P329ORLqjBhG67WEjlEjOxpOXt/PvLbchaoxI8 Rv6tIzX+Kmh5empIUW549zJv2EaSljupeMdn03G+2Hrpd7EHocUV3rcZtIxXs6d6B5 rBo+At1f5cQSHOe3tO/bria5JtD9Wizm8QAoal9kTg3zLBmMs/OOLOBvQKUZ8WvfyD F3RuKVn11qgyl+1EQtzDtw/O0ryEiXSmYoqQa64auKu5C6SlSyOH5t2VErzh+yv2jS ynzGUTn9xmKdTlFrK+6mq8EMiVh3E61V52MEyNT/CTLFYI6XSjbccxJznZwDkKu4ZP gMvFzoiNzM6tg== From: Arnd Bergmann To: Hans Verkuil , Mauro Carvalho Chehab Cc: Arnd Bergmann , "Lad, Prabhakar" , Eduardo Valentin , Sakari Ailus , Greg Kroah-Hartman , Vaibhav Gupta , Liu Shixin , Laurent Pinchart , Jacopo Mondi , Andy Shevchenko , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev Subject: [PATCH v2 6/7] media: subdev: fix compat_ioctl32 Date: Thu, 10 Jun 2021 23:43:04 +0200 Message-Id: <20210610214305.4170835-7-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610214305.4170835-1-arnd@kernel.org> References: <20210610214305.4170835-1-arnd@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Arnd Bergmann The adv7842 and si4713 drivers each define one private ioctl command that are handled through the subdev_ioctl() helpers, but that don't work in compat mode because this does not handle private ioctl commands. The compat_ioctl32 callback for subdevs has outdated calling conventions, but as there are no users of that, it is easy to change the function pointer type and the caller to make it behave the same way as the normal ioctl callback and hook in the two drivers that need no argument conversion. Signed-off-by: Arnd Bergmann --- drivers/media/i2c/adv7842.c | 3 +++ drivers/media/radio/si4713/si4713.c | 3 +++ drivers/media/v4l2-core/v4l2-subdev.c | 19 ++++++++++++++++--- include/media/v4l2-subdev.h | 3 +-- 4 files changed, 23 insertions(+), 5 deletions(-) -- 2.29.2 diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c index 78e61fe6f2f0..cd6df4f52f33 100644 --- a/drivers/media/i2c/adv7842.c +++ b/drivers/media/i2c/adv7842.c @@ -3293,6 +3293,9 @@ static const struct v4l2_ctrl_ops adv7842_ctrl_ops = { static const struct v4l2_subdev_core_ops adv7842_core_ops = { .log_status = adv7842_log_status, .ioctl = adv7842_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl32 = adv7842_ioctl, +#endif .interrupt_service_routine = adv7842_isr, .subscribe_event = adv7842_subscribe_event, .unsubscribe_event = v4l2_event_subdev_unsubscribe, diff --git a/drivers/media/radio/si4713/si4713.c b/drivers/media/radio/si4713/si4713.c index adbf43ff6a21..ae7e477774e3 100644 --- a/drivers/media/radio/si4713/si4713.c +++ b/drivers/media/radio/si4713/si4713.c @@ -1398,6 +1398,9 @@ static const struct v4l2_ctrl_ops si4713_ctrl_ops = { static const struct v4l2_subdev_core_ops si4713_subdev_core_ops = { .ioctl = si4713_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl32 = si4713_ioctl, +#endif }; static const struct v4l2_subdev_tuner_ops si4713_subdev_tuner_ops = { diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index bf3aa9252458..fbd176d6c415 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -686,13 +686,26 @@ static long subdev_ioctl(struct file *file, unsigned int cmd, } #ifdef CONFIG_COMPAT -static long subdev_compat_ioctl32(struct file *file, unsigned int cmd, - unsigned long arg) +static long subdev_do_compat_ioctl32(struct file *file, unsigned int cmd, void *arg) { struct video_device *vdev = video_devdata(file); struct v4l2_subdev *sd = vdev_to_v4l2_subdev(vdev); + struct mutex *lock = vdev->lock; + long ret = -ENODEV; - return v4l2_subdev_call(sd, core, compat_ioctl32, cmd, arg); + if (lock && mutex_lock_interruptible(lock)) + return -ERESTARTSYS; + if (video_is_registered(vdev)) + ret = v4l2_subdev_call(sd, core, compat_ioctl32, cmd, arg); + if (lock) + mutex_unlock(lock); + return ret; +} + +static long subdev_compat_ioctl32(struct file *file, unsigned int cmd, + unsigned long arg) +{ + return video_usercopy(file, cmd, arg, subdev_do_compat_ioctl32); } #endif diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index d0e9a5bdb08b..42aa1f6c7c3f 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -195,8 +195,7 @@ struct v4l2_subdev_core_ops { int (*s_gpio)(struct v4l2_subdev *sd, u32 val); long (*ioctl)(struct v4l2_subdev *sd, unsigned int cmd, void *arg); #ifdef CONFIG_COMPAT - long (*compat_ioctl32)(struct v4l2_subdev *sd, unsigned int cmd, - unsigned long arg); + long (*compat_ioctl32)(struct v4l2_subdev *sd, unsigned int cmd, void *arg); #endif #ifdef CONFIG_VIDEO_ADV_DEBUG int (*g_register)(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg);