lkml.org 
[lkml]   [2018]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 147/165] media: vb2: Fix videobuf2 to map correct area
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Masami Hiramatsu <mhiramat@kernel.org>

    [ Upstream commit d13a0139d7874a0577b5955d6eed895517d23b72 ]

    Fixes vb2_vmalloc_get_userptr() to ioremap correct area.
    Since the current code does ioremap the page address, if the offset > 0,
    it does not do ioremap the last page and results in kernel panic.

    This fixes to pass the size + offset to ioremap so that ioremap
    can map correct area. Also, this uses __pfn_to_phys() to get the physical
    address of given PFN.

    Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
    Reported-by: Takao Orito <orito.takao@socionext.com>
    Reported-by: Fumihiro ATSUMI <atsumi@infinitegra.co.jp>
    Reviewed-by: Marek Szyprowski <m.szyprowski@samsung.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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/media/v4l2-core/videobuf2-vmalloc.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/media/v4l2-core/videobuf2-vmalloc.c
    +++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c
    @@ -106,7 +106,7 @@ static void *vb2_vmalloc_get_userptr(str
    if (nums[i-1] + 1 != nums[i])
    goto fail_map;
    buf->vaddr = (__force void *)
    - ioremap_nocache(nums[0] << PAGE_SHIFT, size);
    + ioremap_nocache(__pfn_to_phys(nums[0]), size + offset);
    } else {
    buf->vaddr = vm_map_ram(frame_vector_pages(vec), n_pages, -1,
    PAGE_KERNEL);

    \
     
     \ /
      Last update: 2018-05-24 12:46    [W:3.006 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site