From mboxrd@z Thu Jan 1 00:00:00 1970 From: Archit Taneja Subject: [PATCH 3/3] staging: android: ion: Avoid calling free_duped_table() twice Date: Wed, 17 May 2017 13:45:48 +0530 Message-ID: <20170517081548.16413-4-architt@codeaurora.org> References: <20170517081548.16413-1-architt@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from smtp.codeaurora.org (smtp.codeaurora.org [198.145.29.96]) by gabe.freedesktop.org (Postfix) with ESMTPS id 10F228924B for ; Wed, 17 May 2017 08:16:03 +0000 (UTC) In-Reply-To: <20170517081548.16413-1-architt@codeaurora.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: labbott@redhat.com, sumit.semwal@linaro.org Cc: devel@driverdev.osuosl.org, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org Q3VycmVudGx5LCB0aGUgZHVwbGljYXRlZCBzZyB0YWJsZSBpcyBmcmVlZCBpbiB0aGUgZGV0YWNo KCkgYW5kCnRoZSBlcnJvciBwYXRoIG9mIG1hcF9kbWFfYnVmKCkgaW9uJ3MgZG1hX2J1Zl9vcHMu CgpJZiBhIGNhbGwgdG8gZG1hX2J1Zl9tYXBfYXR0YWNobWVudCgpIGZhaWxzLCB0aGUgaW1wb3J0 ZXIgaXMKZXhwZWN0ZWQgdG8gY2FsbCBkbWFfYnVmX2RldGFjaCgpIHRvIHJlbW92ZSB0aGUgYXR0 YWNobWVudC4gVGhpcwp3aWxsIHJlc3VsdCBpbiB1cyB0cnlpbmcgdG8gZnJlZSB0aGUgZHVwZWQg c2cgdGFibGUgdHdpY2UuCgpEb24ndCBjYWxsIGZyZWVfZHVwZWRfdGFibGUoKSBpbiBpb25fbWFw X2RtYV9idWYoKSB0byBhdm9pZCB0aGlzLgoKU2lnbmVkLW9mZi1ieTogQXJjaGl0IFRhbmVqYSA8 YXJjaGl0dEBjb2RlYXVyb3JhLm9yZz4KLS0tCiBkcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9pb24v aW9uLmMgfCAxMiArKystLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyks IDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvaW9u L2lvbi5jIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvaW9uL2lvbi5jCmluZGV4IDkwYWU2Y2U0 NjZlZC4uYjQ4M2UxMDgxMzA5IDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9p b24vaW9uLmMKKysrIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvaW9uL2lvbi5jCkBAIC0yNjgs MjAgKzI2OCwxNCBAQCBzdGF0aWMgc3RydWN0IHNnX3RhYmxlICppb25fbWFwX2RtYV9idWYoc3Ry dWN0IGRtYV9idWZfYXR0YWNobWVudCAqYXR0YWNobWVudCwKIHsKIAlzdHJ1Y3QgaW9uX2RtYV9i dWZfYXR0YWNobWVudCAqYSA9IGF0dGFjaG1lbnQtPnByaXY7CiAJc3RydWN0IHNnX3RhYmxlICp0 YWJsZTsKLQlpbnQgcmV0OwogCiAJdGFibGUgPSBhLT50YWJsZTsKIAogCWlmICghZG1hX21hcF9z ZyhhdHRhY2htZW50LT5kZXYsIHRhYmxlLT5zZ2wsIHRhYmxlLT5uZW50cywKLQkJCWRpcmVjdGlv bikpewotCQlyZXQgPSAtRU5PTUVNOwotCQlnb3RvIGVycjsKLQl9Ci0JcmV0dXJuIHRhYmxlOwor CQkJZGlyZWN0aW9uKSkKKwkJcmV0dXJuIEVSUl9QVFIoLUVOT01FTSk7CiAKLWVycjoKLQlmcmVl X2R1cGVkX3RhYmxlKHRhYmxlKTsKLQlyZXR1cm4gRVJSX1BUUihyZXQpOworCXJldHVybiB0YWJs ZTsKIH0KIAogc3RhdGljIHZvaWQgaW9uX3VubWFwX2RtYV9idWYoc3RydWN0IGRtYV9idWZfYXR0 YWNobWVudCAqYXR0YWNobWVudCwKLS0gClRoZSBRdWFsY29tbSBJbm5vdmF0aW9uIENlbnRlciwg SW5jLiBpcyBhIG1lbWJlciBvZiB0aGUgQ29kZSBBdXJvcmEgRm9ydW0sCmhvc3RlZCBieSBUaGUg TGludXggRm91bmRhdGlvbgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJp LWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754141AbdEQIQS (ORCPT ); Wed, 17 May 2017 04:16:18 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:37734 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754027AbdEQIQD (ORCPT ); Wed, 17 May 2017 04:16:03 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 6208C60DA7 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=architt@codeaurora.org From: Archit Taneja To: labbott@redhat.com, sumit.semwal@linaro.org Cc: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, dri-devel@lists.freedesktop.org, Archit Taneja Subject: [PATCH 3/3] staging: android: ion: Avoid calling free_duped_table() twice Date: Wed, 17 May 2017 13:45:48 +0530 Message-Id: <20170517081548.16413-4-architt@codeaurora.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170517081548.16413-1-architt@codeaurora.org> References: <20170517081548.16413-1-architt@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/staging/android/ion/ion.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index 90ae6ce466ed..b483e1081309 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -268,20 +268,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, -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation