diff options
| author | Archit Taneja <architt@codeaurora.org> | 2017-05-17 13:45:48 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-18 15:59:38 +0200 |
| commit | df794cfbb9660f098412481be7d41bcb8e842cc9 (patch) | |
| tree | 5ab03a39d96154832f7acf1d575103825078c2f8 /drivers/staging/android | |
| parent | 83d952ee0f09a7a36970d3d85ddbfffc8bedf32b (diff) | |
| download | op-kernel-dev-df794cfbb9660f098412481be7d41bcb8e842cc9.zip op-kernel-dev-df794cfbb9660f098412481be7d41bcb8e842cc9.tar.gz | |
staging: android: ion: Avoid calling free_duped_table() twice
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>
Diffstat (limited to 'drivers/staging/android')
| -rw-r--r-- | drivers/staging/android/ion/ion.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index c3e601c..afa7c45 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -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 sg_table *table; - int ret; table = a->table; if (!dma_map_sg(attachment->dev, table->sgl, table->nents, - direction)){ - ret = -ENOMEM; - goto err; - } - return table; + direction)) + return ERR_PTR(-ENOMEM); -err: - free_duped_table(table); - return ERR_PTR(ret); + return table; } static void ion_unmap_dma_buf(struct dma_buf_attachment *attachment, |
