提交 a9bb36aa 编写于 作者: A Andrzej Pietrasiewicz 提交者: Mauro Carvalho Chehab

[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: NAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: NKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: NMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 29e3fbd8
...@@ -88,6 +88,7 @@ static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size) ...@@ -88,6 +88,7 @@ static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size)
fail_pages_alloc: fail_pages_alloc:
while (--i >= 0) while (--i >= 0)
__free_page(buf->pages[i]); __free_page(buf->pages[i]);
kfree(buf->pages);
fail_pages_array_alloc: fail_pages_array_alloc:
vfree(buf->sg_desc.sglist); vfree(buf->sg_desc.sglist);
...@@ -176,6 +177,7 @@ static void *vb2_dma_sg_get_userptr(void *alloc_ctx, unsigned long vaddr, ...@@ -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); num_pages_from_user, buf->sg_desc.num_pages);
while (--num_pages_from_user >= 0) while (--num_pages_from_user >= 0)
put_page(buf->pages[num_pages_from_user]); put_page(buf->pages[num_pages_from_user]);
kfree(buf->pages);
userptr_fail_pages_array_alloc: userptr_fail_pages_array_alloc:
vfree(buf->sg_desc.sglist); vfree(buf->sg_desc.sglist);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册