lkml.org 
[lkml]   [2016]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.5 117/200] [media] videobuf2-core: Check user space planes array in dqbuf
    Date
    4.5-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Sakari Ailus <sakari.ailus@linux.intel.com>

    commit e7e0c3e26587749b62d17b9dd0532874186c77f7 upstream.

    The number of planes in videobuf2 is specific to a buffer. In order to
    verify that the planes array provided by the user is long enough, a new
    vb2_buf_op is required.

    Call __verify_planes_array() when the dequeued buffer is known. Return an
    error to the caller if there was one, otherwise remove the buffer from the
    done list.

    Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
    Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/media/v4l2-core/videobuf2-core.c | 10 +++++-----
    include/media/videobuf2-core.h | 4 ++++
    2 files changed, 9 insertions(+), 5 deletions(-)

    --- a/drivers/media/v4l2-core/videobuf2-core.c
    +++ b/drivers/media/v4l2-core/videobuf2-core.c
    @@ -1643,7 +1643,7 @@ static int __vb2_wait_for_done_vb(struct
    * Will sleep if required for nonblocking == false.
    */
    static int __vb2_get_done_vb(struct vb2_queue *q, struct vb2_buffer **vb,
    - int nonblocking)
    + void *pb, int nonblocking)
    {
    unsigned long flags;
    int ret;
    @@ -1664,10 +1664,10 @@ static int __vb2_get_done_vb(struct vb2_
    /*
    * Only remove the buffer from done_list if v4l2_buffer can handle all
    * the planes.
    - * Verifying planes is NOT necessary since it already has been checked
    - * before the buffer is queued/prepared. So it can never fail.
    */
    - list_del(&(*vb)->done_entry);
    + ret = call_bufop(q, verify_planes_array, *vb, pb);
    + if (!ret)
    + list_del(&(*vb)->done_entry);
    spin_unlock_irqrestore(&q->done_lock, flags);

    return ret;
    @@ -1746,7 +1746,7 @@ int vb2_core_dqbuf(struct vb2_queue *q,
    struct vb2_buffer *vb = NULL;
    int ret;

    - ret = __vb2_get_done_vb(q, &vb, nonblocking);
    + ret = __vb2_get_done_vb(q, &vb, pb, nonblocking);
    if (ret < 0)
    return ret;

    --- a/include/media/videobuf2-core.h
    +++ b/include/media/videobuf2-core.h
    @@ -375,6 +375,9 @@ struct vb2_ops {
    /**
    * struct vb2_ops - driver-specific callbacks
    *
    + * @verify_planes_array: Verify that a given user space structure contains
    + * enough planes for the buffer. This is called
    + * for each dequeued buffer.
    * @fill_user_buffer: given a vb2_buffer fill in the userspace structure.
    * For V4L2 this is a struct v4l2_buffer.
    * @fill_vb2_buffer: given a userspace structure, fill in the vb2_buffer.
    @@ -384,6 +387,7 @@ struct vb2_ops {
    * the vb2_buffer struct.
    */
    struct vb2_buf_ops {
    + int (*verify_planes_array)(struct vb2_buffer *vb, const void *pb);
    void (*fill_user_buffer)(struct vb2_buffer *vb, void *pb);
    int (*fill_vb2_buffer)(struct vb2_buffer *vb, const void *pb,
    struct vb2_plane *planes);

    \
     
     \ /
      Last update: 2016-05-03 03:21    [W:4.516 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site