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

Commit a9bb36aa authored by Andrzej Pietrasiewicz's avatar Andrzej Pietrasiewicz Committed by Mauro Carvalho Chehab
Browse files

[media] v4l2: vb2-dma-sg: fix memory leak 



This patch fixes two minor memory leaks in videobuf2-dma-sg module. They
might happen only in case some other operations (like memory allocation)
failed.

Signed-off-by: default avatarAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 29e3fbd8

drivers/media/video/videobuf2-dma-sg.c

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size) 
fail_pages_alloc:

	while (--i >= 0)

		__free_page(buf->pages[i]);

	kfree(buf->pages);



fail_pages_array_alloc:

	vfree(buf->sg_desc.sglist);
@@ -176,6 +177,7 @@ static void *vb2_dma_sg_get_userptr(void *alloc_ctx, unsigned long vaddr, 
	       num_pages_from_user, buf->sg_desc.num_pages);

	while (--num_pages_from_user >= 0)

		put_page(buf->pages[num_pages_from_user]);

	kfree(buf->pages);



userptr_fail_pages_array_alloc:

	vfree(buf->sg_desc.sglist);