Commit 554df753 authored by Ma Ke's avatar Ma Ke Committed by Hans Verkuil
Browse files

media: videobuf2: Fix IS_ERR checking in vb2_dc_put_userptr() 



In order to avoid error pointers from frame_vector_pages(), we could
use IS_ERR() to check the return value to fix this. This checking
operation could make sure that vector contains pages.

Signed-off-by: default avatarMa Ke <make_ruc2021@163.com>
Acked-by: default avatarTomasz Figa <tfiga@chromium.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 2a76e767

drivers/media/common/videobuf2/videobuf2-dma-contig.c

+7 −6
Original line number Diff line number Diff line
@@ -542,13 +542,14 @@ static void vb2_dc_put_userptr(void *buf_priv) 
		 */

		dma_unmap_sgtable(buf->dev, sgt, buf->dma_dir,

				  DMA_ATTR_SKIP_CPU_SYNC);

		if (buf->dma_dir == DMA_FROM_DEVICE ||

				buf->dma_dir == DMA_BIDIRECTIONAL) {

			pages = frame_vector_pages(buf->vec);

			/* sgt should exist only if vector contains pages... */

		BUG_ON(IS_ERR(pages));

		if (buf->dma_dir == DMA_FROM_DEVICE ||

		    buf->dma_dir == DMA_BIDIRECTIONAL)

			if (!WARN_ON_ONCE(IS_ERR(pages)))

				for (i = 0; i < frame_vector_count(buf->vec); i++)

					set_page_dirty_lock(pages[i]);

		}

		sg_free_table(sgt);

		kfree(sgt);

	} else {