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

Commit 2c2dd6ac authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Mauro Carvalho Chehab
Browse files

[media] media: vb2: add a check for uninitialized buffer 



__buffer_in_use() might be called for empty/uninitialized buffer in the
following scenario: REQBUF(n, USER_PTR), QUERYBUF(). This patch fixes
kernel ops in such case.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
CC: Pawel Osciak <pawel@osciak.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent e836a1c0

drivers/media/video/videobuf2-core.c

+2 −2
Original line number Diff line number Diff line
@@ -296,14 +296,14 @@ static bool __buffer_in_use(struct vb2_queue *q, struct vb2_buffer *vb) 
{

	unsigned int plane;

	for (plane = 0; plane < vb->num_planes; ++plane) {

		void *mem_priv = vb->planes[plane].mem_priv;

		/*

		 * If num_users() has not been provided, call_memop

		 * will return 0, apparently nobody cares about this

		 * case anyway. If num_users() returns more than 1,

		 * we are not the only user of the plane's memory.

		 */

		if (call_memop(q, plane, num_users,

				vb->planes[plane].mem_priv) > 1)

		if (mem_priv && call_memop(q, plane, num_users, mem_priv) > 1)

			return true;

	}

	return false;