lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 016/111] media: videobuf2-core: check for q->error in vb2_core_qbuf()
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Hans Verkuil <hverkuil@xs4all.nl>

    [ Upstream commit b509d733d337417bcb7fa4a35be3b9a49332b724 ]

    The vb2_core_qbuf() function didn't check if q->error was set. It is
    checked in __buf_prepare(), but that function isn't called if the buffer
    was already prepared before with VIDIOC_PREPARE_BUF.

    So check it at the start of vb2_core_qbuf() as well.

    Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
    Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
    Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/media/v4l2-core/videobuf2-core.c | 5 +++++
    1 file changed, 5 insertions(+)

    --- a/drivers/media/v4l2-core/videobuf2-core.c
    +++ b/drivers/media/v4l2-core/videobuf2-core.c
    @@ -1375,6 +1375,11 @@ int vb2_core_qbuf(struct vb2_queue *q, u
    struct vb2_buffer *vb;
    int ret;

    + if (q->error) {
    + dprintk(1, "fatal error occurred on queue\n");
    + return -EIO;
    + }
    +
    vb = q->bufs[index];

    switch (vb->state) {

    \
     
     \ /
      Last update: 2018-09-24 13:59    [W:8.198 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site