From patchwork Wed May 4 11:20:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 9012411 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5C262BF29F for ; Wed, 4 May 2016 11:24:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8B1522038F for ; Wed, 4 May 2016 11:24:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9CD2420108 for ; Wed, 4 May 2016 11:24:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752557AbcEDLY2 (ORCPT ); Wed, 4 May 2016 07:24:28 -0400 Received: from mga04.intel.com ([192.55.52.120]:43206 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752378AbcEDLY0 (ORCPT ); Wed, 4 May 2016 07:24:26 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP; 04 May 2016 04:24:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,576,1455004800"; d="scan'208";a="972348702" Received: from paasikivi.fi.intel.com ([10.237.72.42]) by fmsmga002.fm.intel.com with ESMTP; 04 May 2016 04:24:04 -0700 Received: from nauris.fi.intel.com (nauris.localdomain [192.168.240.2]) by paasikivi.fi.intel.com (Postfix) with ESMTP id 4509B20B82; Wed, 4 May 2016 14:24:03 +0300 (EEST) Received: by nauris.fi.intel.com (Postfix, from userid 1000) id C811A200A8; Wed, 4 May 2016 14:21:05 +0300 (EEST) From: Sakari Ailus To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, hverkuil@xs4all.nl, mchehab@osg.samsung.com Subject: [PATCH v2 1/5] media: Determine early whether an IOCTL is supported Date: Wed, 4 May 2016 14:20:51 +0300 Message-Id: <1462360855-23354-2-git-send-email-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1462360855-23354-1-git-send-email-sakari.ailus@linux.intel.com> References: <1462360855-23354-1-git-send-email-sakari.ailus@linux.intel.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Preparation for refactoring media IOCTL handling to unify common parts. Signed-off-by: Sakari Ailus Reviewed-by: Laurent Pinchart --- drivers/media/media-device.c | 52 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 3 deletions(-) diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 898a3cf..c24149d 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -419,13 +419,33 @@ static long media_device_get_topology(struct media_device *mdev, return 0; } -static long media_device_ioctl(struct file *filp, unsigned int cmd, - unsigned long arg) +#define MEDIA_IOC(__cmd) \ + [_IOC_NR(MEDIA_IOC_##__cmd)] = { .cmd = MEDIA_IOC_##__cmd } + +/* the table is indexed by _IOC_NR(cmd) */ +struct media_ioctl_info { + unsigned int cmd; +}; + +static inline long is_valid_ioctl(const struct media_ioctl_info *info, + unsigned int len, unsigned int cmd) +{ + return (_IOC_NR(cmd) >= len + || info[_IOC_NR(cmd)].cmd != cmd) ? -ENOIOCTLCMD : 0; +} + +static long __media_device_ioctl( + struct file *filp, unsigned int cmd, void __user *arg, + const struct media_ioctl_info *info_array, unsigned int info_array_len) { struct media_devnode *devnode = media_devnode_data(filp); struct media_device *dev = to_media_device(devnode); long ret; + ret = is_valid_ioctl(info_array, info_array_len, cmd); + if (ret) + return ret; + mutex_lock(&dev->graph_mutex); switch (cmd) { case MEDIA_IOC_DEVICE_INFO: @@ -461,6 +481,22 @@ static long media_device_ioctl(struct file *filp, unsigned int cmd, return ret; } +static const struct media_ioctl_info ioctl_info[] = { + MEDIA_IOC(DEVICE_INFO), + MEDIA_IOC(ENUM_ENTITIES), + MEDIA_IOC(ENUM_LINKS), + MEDIA_IOC(SETUP_LINK), + MEDIA_IOC(G_TOPOLOGY), +}; + +static long media_device_ioctl(struct file *filp, unsigned int cmd, + unsigned long arg) +{ + return __media_device_ioctl( + filp, cmd, (void __user *)arg, + ioctl_info, ARRAY_SIZE(ioctl_info)); +} + #ifdef CONFIG_COMPAT struct media_links_enum32 { @@ -491,6 +527,14 @@ static long media_device_enum_links32(struct media_device *mdev, #define MEDIA_IOC_ENUM_LINKS32 _IOWR('|', 0x02, struct media_links_enum32) +static const struct media_ioctl_info compat_ioctl_info[] = { + MEDIA_IOC(DEVICE_INFO), + MEDIA_IOC(ENUM_ENTITIES), + MEDIA_IOC(ENUM_LINKS32), + MEDIA_IOC(SETUP_LINK), + MEDIA_IOC(G_TOPOLOGY), +}; + static long media_device_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { @@ -503,7 +547,9 @@ static long media_device_compat_ioctl(struct file *filp, unsigned int cmd, case MEDIA_IOC_ENUM_ENTITIES: case MEDIA_IOC_SETUP_LINK: case MEDIA_IOC_G_TOPOLOGY: - return media_device_ioctl(filp, cmd, arg); + return __media_device_ioctl( + filp, cmd, (void __user *)arg, + compat_ioctl_info, ARRAY_SIZE(compat_ioctl_info)); case MEDIA_IOC_ENUM_LINKS32: mutex_lock(&dev->graph_mutex);