From patchwork Wed Feb 7 01:48:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Courbot X-Patchwork-Id: 10204499 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D882D6020F for ; Wed, 7 Feb 2018 01:52:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C7F9528D86 for ; Wed, 7 Feb 2018 01:52:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC1A128D98; Wed, 7 Feb 2018 01:52:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EB3528D86 for ; Wed, 7 Feb 2018 01:52:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753020AbeBGBsu (ORCPT ); Tue, 6 Feb 2018 20:48:50 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:42278 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752995AbeBGBsn (ORCPT ); Tue, 6 Feb 2018 20:48:43 -0500 Received: by mail-pf0-f194.google.com with SMTP id b25so1479013pfd.9 for ; Tue, 06 Feb 2018 17:48:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DImJ4vIw8Hph4mJcvRb9DnpDmxfUq7dWHwPDFlJAuOs=; b=nvqT7gkcZlrIR95/cw29aHOOXJMF43nH/8mks3gkrDqpgHVX1Jk7n+G02nr15r5yO5 /OkTgT0GNXxX/SWOcHOKCtYQ45iQyTCcIS+5qZ0hAqCvIgs0nVdbXz3JR7Zjyq8HQxkg rk3v2cVlduN015nNIZiD0Cno6X4QBi6N9pxmw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DImJ4vIw8Hph4mJcvRb9DnpDmxfUq7dWHwPDFlJAuOs=; b=PRmTnEZPnc4r2Q9+XuGvaJ+iqLWfwBncdyQt/rrgGv2+8g/okt0CGa2G8K5egTSZfZ aJyrelEmvOHYi4FlSZgdSr5+BSeeiExSHlXkPXPaEaQDSPCN++byibCscnzwLzGmnxbN xDBN9CCy4SXdb+7btmAVpHjNp8K/Dg+hVKytFdqJx7FkuY63uyH1D5Z8JCzWv+zVHwYU aa5su6IujlvH6Jpej+qaiHxmxZgbGIItLD4Bw5l2skmcuICHkiOiHoPCnxUdJeqEAyM+ aTEw18eHaCwcXitJwKObPY3rbKGDX42lmOImb30BcHPHmPpBoU4aSUNhjnRVEmvqszVp peuA== X-Gm-Message-State: APf1xPCAgCwW4+kSWxalj7LiaIWNWCkJ68hdiNHEGKiL/siS400XzyUT Zbx/Q8QK6RFl3GTjrkhwqkDvbg== X-Google-Smtp-Source: AH8x2245HymLFXZgJnaOoOdr74wsRNMngHeFJHwq6MjzuJD9Eah9sqTsfPqjjYfCz+/XthFD4+A2eQ== X-Received: by 10.99.177.76 with SMTP id g12mr3522986pgp.269.1517968123081; Tue, 06 Feb 2018 17:48:43 -0800 (PST) Received: from acourbot.tok.corp.google.com ([2401:fa00:4:1002:a6cd:a898:e07b:a331]) by smtp.gmail.com with ESMTPSA id x26sm528060pfi.141.2018.02.06.17.48.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Feb 2018 17:48:42 -0800 (PST) From: Alexandre Courbot To: Mauro Carvalho Chehab , Hans Verkuil , Laurent Pinchart , Pawel Osciak , Marek Szyprowski , Tomasz Figa , Sakari Ailus , Gustavo Padovan Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Alexandre Courbot Subject: [RFCv3 04/17] media: vb2: add support for requests in QBUF ioctl Date: Wed, 7 Feb 2018 10:48:08 +0900 Message-Id: <20180207014821.164536-5-acourbot@chromium.org> X-Mailer: git-send-email 2.16.0.rc1.238.g530d649a79-goog In-Reply-To: <20180207014821.164536-1-acourbot@chromium.org> References: <20180207014821.164536-1-acourbot@chromium.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Support the request argument of the QBUF ioctl. Signed-off-by: Alexandre Courbot --- drivers/media/v4l2-core/v4l2-ioctl.c | 83 +++++++++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index 2f40ac0cdf6e..235acdde3111 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -29,6 +29,7 @@ #include #include #include +#include #include @@ -968,6 +969,71 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type) return -EINVAL; } +/* + * Validate that a given request can be used during an ioctl. + * + * When using the request API, request file descriptors must be matched against + * the actual request object. User-space can pass any file descriptor, so we + * need to make sure the call is valid before going further. + * + * This function looks up the request and associated data and performs the + * following sanity checks: + * + * * Make sure that the entity belongs to the media_device managing the passed + * request, + * * Make sure that the entity data (if any) is associated to the current file + * handler. + * + * This function returns a pointer to the valid request, or and error code in + * case of failure. When successful, a reference to the request is acquired and + * must be properly released by the caller. If _data is not NULL, then it is + * filled with a pointer to the corresponding entity data. + */ +#ifdef CONFIG_MEDIA_CONTROLLER +static struct media_request * +check_request(int request, struct file *file, void *fh, struct media_request_entity_data **_data) +{ + struct media_request *req = NULL; + struct video_device *vfd = video_devdata(file); + struct v4l2_fh *vfh = + test_bit(V4L2_FL_USES_V4L2_FH, &vfd->flags) ? fh : NULL; + struct media_entity *entity = &vfd->entity; + struct media_request_entity_data *data; + + if (!entity) + return ERR_PTR(-EINVAL); + + req = media_request_get_from_fd(request); + if (!req) + return ERR_PTR(-EINVAL); + + /* Validate that the entity belongs to the correct media_device */ + if (vfd->v4l2_dev->mdev->req_mgr != req->mgr) { + media_request_put(req); + return ERR_PTR(-EINVAL); + } + + /* Validate that the entity's data belongs to the correct fh */ + data = media_request_get_entity_data(req, entity, vfh); + if (IS_ERR(data)) { + media_request_put(req); + return ERR_PTR(PTR_ERR(data)); + } + + if (_data) + *_data = data; + + return req; +} +#else /* CONFIG_MEDIA_CONTROLLER */ +static struct media_request * +check_request(int request, struct file *file, void *fh) +{ + return ERR_PTR(-ENOSYS); +} + +#endif /* CONFIG_MEDIA_CONTROLLER */ + static void v4l_sanitize_format(struct v4l2_format *fmt) { unsigned int offset; @@ -1878,10 +1944,25 @@ static int v4l_querybuf(const struct v4l2_ioctl_ops *ops, static int v4l_qbuf(const struct v4l2_ioctl_ops *ops, struct file *file, void *fh, void *arg) { + struct media_request *req = NULL; struct v4l2_buffer *p = arg; int ret = check_fmt(file, p->type); - return ret ? ret : ops->vidioc_qbuf(file, fh, p); + if (ret) + return ret; + + if (p->request_fd > 0) { + req = check_request(p->request_fd, file, fh, NULL); + if (IS_ERR(req)) + return PTR_ERR(req); + } + + ret = ops->vidioc_qbuf(file, fh, p); + + if (req) + media_request_put(req); + + return ret; } static int v4l_dqbuf(const struct v4l2_ioctl_ops *ops,