leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: android: ion: Avoid calling free_duped_table() twice

Browse Source 
Currently, the duplicated sg table is freed in the detach() and
the error path of map_dma_buf() ion's dma_buf_ops.

If a call to dma_buf_map_attachment() fails, the importer is
expected to call dma_buf_detach() to remove the attachment. This
will result in us trying to free the duped sg table twice.

Don't call free_duped_table() in ion_map_dma_buf() to avoid this.

Signed-off-by: Archit Taneja <architt@codeaurora.org>
Acked-by: Laura Abbott <labbott@redhat.com>
Reviewed-by: Sumit Semwal <sumit.semwal@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Archit Taneja 2017-05-17 13:45:48 +05:30 committed by Greg Kroah-Hartman
parent 83d952ee0f
commit df794cfbb9
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/android/ion/ion.c
View File

@ -267,20 +267,14 @@ static struct sg_table *ion_map_dma_buf(struct dma_buf_attachment *attachment,
{ {
struct ion_dma_buf_attachment *a = attachment->priv; struct ion_dma_buf_attachment *a = attachment->priv;
struct sg_table *table; struct sg_table *table;
int ret;
table = a->table; table = a->table;
if (!dma_map_sg(attachment->dev, table->sgl, table->nents, if (!dma_map_sg(attachment->dev, table->sgl, table->nents,
direction)){ direction))
ret = -ENOMEM; return ERR_PTR(-ENOMEM);
goto err;
}
return table;
err: return table;
free_duped_table(table);
return ERR_PTR(ret);
} }
static void ion_unmap_dma_buf(struct dma_buf_attachment *attachment, static void ion_unmap_dma_buf(struct dma_buf_attachment *attachment,