Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28ea156b authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Greg Kroah-Hartman
Browse files

media: vb2: Fix videobuf2 to map correct area 



[ 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: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Reported-by: default avatarTakao Orito <orito.takao@socionext.com>
Reported-by: default avatarFumihiro ATSUMI <atsumi@infinitegra.co.jp>
Reviewed-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 07c41c40

drivers/media/v4l2-core/videobuf2-vmalloc.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static void *vb2_vmalloc_get_userptr(struct device *dev, unsigned long vaddr, 
			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);