Commit a3e722da authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

udmabuf: improve map_udmabuf error handling 



Reported-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20180911134216.9760-3-kraxel@redhat.com
parent 913965c4

drivers/dma-buf/udmabuf.c

+10 −11
Original line number Diff line number Diff line
@@ -51,25 +51,24 @@ static struct sg_table *map_udmabuf(struct dma_buf_attachment *at, 
{

	struct udmabuf *ubuf = at->dmabuf->priv;

	struct sg_table *sg;

	int ret;



	sg = kzalloc(sizeof(*sg), GFP_KERNEL);

	if (!sg)

		goto err1;

	if (sg_alloc_table_from_pages(sg, ubuf->pages, ubuf->pagecount,

		return ERR_PTR(-ENOMEM);

	ret = sg_alloc_table_from_pages(sg, ubuf->pages, ubuf->pagecount,

					0, ubuf->pagecount << PAGE_SHIFT,

				      GFP_KERNEL) < 0)

		goto err2;

					GFP_KERNEL);

	if (ret < 0)

		goto err;

	if (!dma_map_sg(at->dev, sg->sgl, sg->nents, direction))

		goto err3;



		goto err;

	return sg;



err3:

err:

	sg_free_table(sg);

err2:

	kfree(sg);

err1:

	return ERR_PTR(-ENOMEM);

	return ERR_PTR(ret);

}



static void unmap_udmabuf(struct dma_buf_attachment *at,