lkml.org 
[lkml]   [2019]   [Jul]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 211/271] media: videobuf2-core: Prevent size alignment wrapping buffer size to 0
    Date
    From: Sakari Ailus <sakari.ailus@linux.intel.com>

    commit defcdc5d89ced780fb45196d539d6570ec5b1ba5 upstream.

    PAGE_ALIGN() may wrap the buffer size around to 0. Prevent this by
    checking that the aligned value is not smaller than the unaligned one.

    Note on backporting to stable: the file used to be under
    drivers/media/v4l2-core, it was moved to the current location after 4.14.

    Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
    Cc: stable@vger.kernel.org
    Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/media/common/videobuf2/videobuf2-core.c | 4 ++++
    1 file changed, 4 insertions(+)

    --- a/drivers/media/common/videobuf2/videobuf2-core.c
    +++ b/drivers/media/common/videobuf2/videobuf2-core.c
    @@ -207,6 +207,10 @@ static int __vb2_buf_mem_alloc(struct vb
    for (plane = 0; plane < vb->num_planes; ++plane) {
    unsigned long size = PAGE_ALIGN(vb->planes[plane].length);

    + /* Did it wrap around? */
    + if (size < vb->planes[plane].length)
    + goto free;
    +
    mem_priv = call_ptr_memop(vb, alloc,
    q->alloc_devs[plane] ? : q->dev,
    q->dma_attrs, size, q->dma_dir, q->gfp_flags);

    \
     
     \ /
      Last update: 2019-07-25 08:09    [W:5.557 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site