From: Hans Verkuil <hverkuil@xs4all.nl>
To: Sakari Ailus <sakari.ailus@linux.intel.com>, linux-media@vger.kernel.org
Cc: mchehab@osg.samsung.com, david@unsolicited.net,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 1/2] vb2: core: Skip planes array verification if pb is NULL
Date: Fri, 13 May 2016 11:09:19 +0200 [thread overview]
Message-ID: <573599BF.4050708@xs4all.nl> (raw)
In-Reply-To: <1463055292-25053-2-git-send-email-sakari.ailus@linux.intel.com>
On 05/12/2016 02:14 PM, Sakari Ailus wrote:
> An earlier patch fixing an input validation issue introduced another
> issue: vb2_core_dqbuf() is called with pb argument value NULL in some
> cases, causing a NULL pointer dereference. Fix this by skipping the
> verification as there's nothing to verify.
>
> Signed-off-by: David R <david@unsolicited.net>
>
> Use if () instead of ? :; it's nicer that way. Improve the comment in the
> code as well.
This comment doesn't seem applicable to this patch.
Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com>
Hans
>
> Fixes: e7e0c3e26587 ("[media] videobuf2-core: Check user space planes array in dqbuf")
>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Cc: stable@vger.kernel.org # for v4.4 and later
> ---
> drivers/media/v4l2-core/videobuf2-core.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
> index 9fbcb67..633fc1a 100644
> --- a/drivers/media/v4l2-core/videobuf2-core.c
> +++ b/drivers/media/v4l2-core/videobuf2-core.c
> @@ -1648,7 +1648,7 @@ static int __vb2_get_done_vb(struct vb2_queue *q, struct vb2_buffer **vb,
> void *pb, int nonblocking)
> {
> unsigned long flags;
> - int ret;
> + int ret = 0;
>
> /*
> * Wait for at least one buffer to become available on the done_list.
> @@ -1664,10 +1664,12 @@ static int __vb2_get_done_vb(struct vb2_queue *q, struct vb2_buffer **vb,
> spin_lock_irqsave(&q->done_lock, flags);
> *vb = list_first_entry(&q->done_list, struct vb2_buffer, done_entry);
> /*
> - * Only remove the buffer from done_list if v4l2_buffer can handle all
> - * the planes.
> + * Only remove the buffer from done_list if all planes can be
> + * handled. Some cases such as V4L2 file I/O and DVB have pb
> + * == NULL; skip the check then as there's nothing to verify.
> */
> - ret = call_bufop(q, verify_planes_array, *vb, pb);
> + if (pb)
> + ret = call_bufop(q, verify_planes_array, *vb, pb);
> if (!ret)
> list_del(&(*vb)->done_entry);
> spin_unlock_irqrestore(&q->done_lock, flags);
>
next prev parent reply other threads:[~2016-05-13 9:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-12 12:14 [PATCH v2 0/2] videobuf2: Fix kernel memory overwriting Sakari Ailus
2016-05-12 12:14 ` [PATCH v2 1/2] vb2: core: Skip planes array verification if pb is NULL Sakari Ailus
2016-05-13 9:09 ` Hans Verkuil [this message]
2016-05-13 9:38 ` Sakari Ailus
2016-05-12 12:14 ` [PATCH v2 2/2] [media] videobuf2-v4l2: Verify planes array in buffer dequeueing Sakari Ailus
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=573599BF.4050708@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=david@unsolicited.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@osg.samsung.com \
--cc=sakari.ailus@linux.intel.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