From: Ming Lei <ming.lei@canonical.com>
To: Mauro Carvalho Chehab <mchehab@infradead.org>,
Tony Lindgren <tony@atomide.com>
Cc: Sylwester Nawrocki <snjw23@gmail.com>,
Alan Cox <alan@lxorguk.ukuu.org.uk>,
linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
Ming Lei <ming.lei@canonical.com>, Arnd Bergmann <arnd@arndb.de>
Subject: [RFC PATCH v2 5/8] media: v4l2-ioctl: support 64/32 compatible array parameter
Date: Wed, 14 Dec 2011 22:00:11 +0800 [thread overview]
Message-ID: <1323871214-25435-6-git-send-email-ming.lei@canonical.com> (raw)
In-Reply-To: <1323871214-25435-1-git-send-email-ming.lei@canonical.com>
This patch supports to handle 64/32 compatible array parameter,
such as below:
struct v4l2_fd_result {
__u32 buf_index;
__u32 face_cnt;
__u32 reserved[6];
struct v4l2_fd_detection fd[];
};
With this patch, the pointer to user space array needn't be passed
to kernel any more.
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Ming Lei <ming.lei@canonical.com>
---
drivers/media/video/v4l2-ioctl.c | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index e1da8fc..ded8b72 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -2239,6 +2239,11 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
return ret;
}
+static int is_64_32_array_args(unsigned int cmd, void *parg, int *extra_len)
+{
+ return 0;
+}
+
long
video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
v4l2_kioctl func)
@@ -2251,6 +2256,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
size_t array_size = 0;
void __user *user_ptr = NULL;
void **kernel_ptr = NULL;
+ int extra = 0;
/* Copy arguments into temp kernel buffer */
if (_IOC_DIR(cmd) != _IOC_NONE) {
@@ -2280,9 +2286,32 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
}
}
- err = check_array_args(cmd, parg, &array_size, &user_ptr, &kernel_ptr);
+ if (is_64_32_array_args(cmd, parg, &extra)) {
+ int size;
+ void *old_mbuf;
+
+ err = 0;
+ if (!extra)
+ goto handle_array_args;
+ old_mbuf = mbuf;
+ size = extra + _IOC_SIZE(cmd);
+ mbuf = kmalloc(size, GFP_KERNEL);
+ if (NULL == mbuf) {
+ mbuf = old_mbuf;
+ err = -ENOMEM;
+ goto out;
+ }
+ memcpy(mbuf, parg, _IOC_SIZE(cmd));
+ parg = mbuf;
+ kfree(old_mbuf);
+ } else {
+ err = check_array_args(cmd, parg, &array_size,
+ &user_ptr, &kernel_ptr);
+ }
+
if (err < 0)
goto out;
+handle_array_args:
has_array_args = err;
if (has_array_args) {
@@ -2321,7 +2350,7 @@ out_array_args:
switch (_IOC_DIR(cmd)) {
case _IOC_READ:
case (_IOC_WRITE | _IOC_READ):
- if (copy_to_user((void __user *)arg, parg, _IOC_SIZE(cmd)))
+ if (copy_to_user((void __user *)arg, parg, _IOC_SIZE(cmd) + extra))
err = -EFAULT;
break;
}
--
1.7.5.4
next prev parent reply other threads:[~2011-12-14 14:01 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-14 14:00 [RFC PATCH v2 0/7] media: introduce object detection(OD) driver Ming Lei
2011-12-14 14:00 ` [RFC PATCH v2 1/8] omap4: introduce fdif(face detect module) hwmod Ming Lei
2011-12-16 5:53 ` Paul Walmsley
2011-12-16 14:54 ` Cousson, Benoit
2011-12-19 21:48 ` Paul Walmsley
2011-12-14 14:00 ` [RFC PATCH v2 2/8] omap4: build fdif omap device from hwmod Ming Lei
2011-12-14 14:00 ` [RFC PATCH v2 3/8] media: videobuf2: move out of setting pgprot_noncached from vb2_mmap_pfn_range Ming Lei
2011-12-14 14:00 ` [RFC PATCH v2 4/8] media: videobuf2: introduce VIDEOBUF2_PAGE memops Ming Lei
2011-12-22 9:28 ` Marek Szyprowski
2011-12-23 9:22 ` Ming Lei
2011-12-23 9:34 ` Marek Szyprowski
2011-12-23 9:51 ` Ming Lei
2011-12-23 10:38 ` Marek Szyprowski
2011-12-23 12:20 ` Ming Lei
2012-01-10 10:20 ` Marek Szyprowski
2012-01-10 11:55 ` Ming Lei
2011-12-14 14:00 ` Ming Lei [this message]
2011-12-14 14:00 ` [RFC PATCH v2 6/8] media: v4l2: introduce two IOCTLs for object detection Ming Lei
2012-01-13 21:16 ` Sylwester Nawrocki
2011-12-14 14:00 ` [RFC PATCH v2 7/8] media: video: introduce object detection driver module Ming Lei
2011-12-29 17:16 ` Sylwester Nawrocki
2012-01-04 8:13 ` Ming Lei
2012-01-17 21:05 ` Sylwester Nawrocki
2011-12-14 14:00 ` [RFC PATCH v2 8/8] media: video: introduce omap4 face detection module driver Ming Lei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1323871214-25435-6-git-send-email-ming.lei@canonical.com \
--to=ming.lei@canonical.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=mchehab@infradead.org \
--cc=snjw23@gmail.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).