From: Hans Verkuil <hverkuil@xs4all.nl>
To: Tiffany Lin <tiffany.lin@mediatek.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Eddie Huang <eddie.huang@mediatek.com>,
Yingjoe Chen <yingjoe.chen@mediatek.com>,
linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org
Subject: Re: [PATCH v4] media: v4l2-compat-ioctl32: fix missing length copy in put_v4l2_buffer32
Date: Tue, 19 Jan 2016 08:59:48 +0100 [thread overview]
Message-ID: <569DECF4.6020203@xs4all.nl> (raw)
In-Reply-To: <1453190210-49347-1-git-send-email-tiffany.lin@mediatek.com>
On 01/19/2016 08:56 AM, Tiffany Lin wrote:
> In v4l2-compliance utility, test QUERYBUF required correct length
> value to go through each planar to check planar's length in
> multi-planar buffer type
>
> Signed-off-by: Tiffany Lin <tiffany.lin@mediatek.com>
Looks good!
I'll merge this.
Regards,
Hans
> ---
> drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 21 ++++++++-------------
> 1 file changed, 8 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
> index 327e83a..f38c076 100644
> --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
> +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
> @@ -415,7 +415,8 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
> get_user(kp->index, &up->index) ||
> get_user(kp->type, &up->type) ||
> get_user(kp->flags, &up->flags) ||
> - get_user(kp->memory, &up->memory))
> + get_user(kp->memory, &up->memory) ||
> + get_user(kp->length, &up->length))
> return -EFAULT;
>
> if (V4L2_TYPE_IS_OUTPUT(kp->type))
> @@ -427,9 +428,6 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
> return -EFAULT;
>
> if (V4L2_TYPE_IS_MULTIPLANAR(kp->type)) {
> - if (get_user(kp->length, &up->length))
> - return -EFAULT;
> -
> num_planes = kp->length;
> if (num_planes == 0) {
> kp->m.planes = NULL;
> @@ -462,16 +460,14 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
> } else {
> switch (kp->memory) {
> case V4L2_MEMORY_MMAP:
> - if (get_user(kp->length, &up->length) ||
> - get_user(kp->m.offset, &up->m.offset))
> + if (get_user(kp->m.offset, &up->m.offset))
> return -EFAULT;
> break;
> case V4L2_MEMORY_USERPTR:
> {
> compat_long_t tmp;
>
> - if (get_user(kp->length, &up->length) ||
> - get_user(tmp, &up->m.userptr))
> + if (get_user(tmp, &up->m.userptr))
> return -EFAULT;
>
> kp->m.userptr = (unsigned long)compat_ptr(tmp);
> @@ -513,7 +509,8 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
> copy_to_user(&up->timecode, &kp->timecode, sizeof(struct v4l2_timecode)) ||
> put_user(kp->sequence, &up->sequence) ||
> put_user(kp->reserved2, &up->reserved2) ||
> - put_user(kp->reserved, &up->reserved))
> + put_user(kp->reserved, &up->reserved) ||
> + put_user(kp->length, &up->length))
> return -EFAULT;
>
> if (V4L2_TYPE_IS_MULTIPLANAR(kp->type)) {
> @@ -536,13 +533,11 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
> } else {
> switch (kp->memory) {
> case V4L2_MEMORY_MMAP:
> - if (put_user(kp->length, &up->length) ||
> - put_user(kp->m.offset, &up->m.offset))
> + if (put_user(kp->m.offset, &up->m.offset))
> return -EFAULT;
> break;
> case V4L2_MEMORY_USERPTR:
> - if (put_user(kp->length, &up->length) ||
> - put_user(kp->m.userptr, &up->m.userptr))
> + if (put_user(kp->m.userptr, &up->m.userptr))
> return -EFAULT;
> break;
> case V4L2_MEMORY_OVERLAY:
>
next prev parent reply other threads:[~2016-01-19 7:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-19 7:56 [PATCH v4] media: v4l2-compat-ioctl32: fix missing length copy in put_v4l2_buffer32 Tiffany Lin
2016-01-19 7:59 ` Hans Verkuil [this message]
2016-01-24 22:10 ` Laurent Pinchart
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=569DECF4.6020203@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=eddie.huang@mediatek.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=mchehab@osg.samsung.com \
--cc=tiffany.lin@mediatek.com \
--cc=yingjoe.chen@mediatek.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