lkml.org 
[lkml]   [2018]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.15 081/102] media: cpia2: Fix a couple off by one bugs
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit d5ac225c7d64c9c3ef821239edc035634e594ec9 ]

    The cam->buffers[] array has cam->num_frames elements so the > needs to
    be changed to >= to avoid going beyond the end of the array. The
    ->buffers[] array is allocated in cpia2_allocate_buffers() if you want
    to confirm.

    Fixes: ab33d5071de7 ("V4L/DVB (3376): Add cpia2 camera support")

    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/media/usb/cpia2/cpia2_v4l.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/usb/cpia2/cpia2_v4l.c b/drivers/media/usb/cpia2/cpia2_v4l.c
    index 3dedd83f0b19..a1c59f19cf2d 100644
    --- a/drivers/media/usb/cpia2/cpia2_v4l.c
    +++ b/drivers/media/usb/cpia2/cpia2_v4l.c
    @@ -808,7 +808,7 @@ static int cpia2_querybuf(struct file *file, void *fh, struct v4l2_buffer *buf)
    struct camera_data *cam = video_drvdata(file);

    if(buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
    - buf->index > cam->num_frames)
    + buf->index >= cam->num_frames)
    return -EINVAL;

    buf->m.offset = cam->buffers[buf->index].data - cam->frame_buffer;
    @@ -859,7 +859,7 @@ static int cpia2_qbuf(struct file *file, void *fh, struct v4l2_buffer *buf)

    if(buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
    buf->memory != V4L2_MEMORY_MMAP ||
    - buf->index > cam->num_frames)
    + buf->index >= cam->num_frames)
    return -EINVAL;

    DBG("QBUF #%d\n", buf->index);
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-04 01:35    [W:3.466 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site