From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [PATCH v2 02/13] udmabuf: improve map_udmabuf error handling Date: Tue, 11 Sep 2018 15:42:05 +0200 Message-ID: <20180911134216.9760-3-kraxel@redhat.com> References: <20180911134216.9760-1-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by gabe.freedesktop.org (Postfix) with ESMTPS id 172E26E38C for ; Tue, 11 Sep 2018 13:42:20 +0000 (UTC) In-Reply-To: <20180911134216.9760-1-kraxel@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Gerd Hoffmann , open list , "moderated list:DMA BUFFER SHARING FRAMEWORK" , laurent.pinchart@ideasonboard.com, "open list:DMA BUFFER SHARING FRAMEWORK" List-Id: dri-devel@lists.freedesktop.org UmVwb3J0ZWQtYnk6IExhdXJlbnQgUGluY2hhcnQgPGxhdXJlbnQucGluY2hhcnRAaWRlYXNvbmJv YXJkLmNvbT4KU2lnbmVkLW9mZi1ieTogR2VyZCBIb2ZmbWFubiA8a3JheGVsQHJlZGhhdC5jb20+ ClJldmlld2VkLWJ5OiBMYXVyZW50IFBpbmNoYXJ0IDxsYXVyZW50LnBpbmNoYXJ0QGlkZWFzb25i b2FyZC5jb20+CkFja2VkLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNo PgotLS0KIGRyaXZlcnMvZG1hLWJ1Zi91ZG1hYnVmLmMgfCAyMSArKysrKysrKysrLS0tLS0tLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2RtYS1idWYvdWRtYWJ1Zi5jIGIvZHJpdmVycy9kbWEtYnVmL3Vk bWFidWYuYwppbmRleCAxNTUwNTBjNzQxLi4wZDAzMzY3YzU3IDEwMDY0NAotLS0gYS9kcml2ZXJz L2RtYS1idWYvdWRtYWJ1Zi5jCisrKyBiL2RyaXZlcnMvZG1hLWJ1Zi91ZG1hYnVmLmMKQEAgLTUx LDI1ICs1MSwyNCBAQCBzdGF0aWMgc3RydWN0IHNnX3RhYmxlICptYXBfdWRtYWJ1ZihzdHJ1Y3Qg ZG1hX2J1Zl9hdHRhY2htZW50ICphdCwKIHsKIAlzdHJ1Y3QgdWRtYWJ1ZiAqdWJ1ZiA9IGF0LT5k bWFidWYtPnByaXY7CiAJc3RydWN0IHNnX3RhYmxlICpzZzsKKwlpbnQgcmV0OwogCiAJc2cgPSBr emFsbG9jKHNpemVvZigqc2cpLCBHRlBfS0VSTkVMKTsKIAlpZiAoIXNnKQotCQlnb3RvIGVycjE7 Ci0JaWYgKHNnX2FsbG9jX3RhYmxlX2Zyb21fcGFnZXMoc2csIHVidWYtPnBhZ2VzLCB1YnVmLT5w YWdlY291bnQsCi0JCQkJICAgICAgMCwgdWJ1Zi0+cGFnZWNvdW50IDw8IFBBR0VfU0hJRlQsCi0J CQkJICAgICAgR0ZQX0tFUk5FTCkgPCAwKQotCQlnb3RvIGVycjI7CisJCXJldHVybiBFUlJfUFRS KC1FTk9NRU0pOworCXJldCA9IHNnX2FsbG9jX3RhYmxlX2Zyb21fcGFnZXMoc2csIHVidWYtPnBh Z2VzLCB1YnVmLT5wYWdlY291bnQsCisJCQkJCTAsIHVidWYtPnBhZ2Vjb3VudCA8PCBQQUdFX1NI SUZULAorCQkJCQlHRlBfS0VSTkVMKTsKKwlpZiAocmV0IDwgMCkKKwkJZ290byBlcnI7CiAJaWYg KCFkbWFfbWFwX3NnKGF0LT5kZXYsIHNnLT5zZ2wsIHNnLT5uZW50cywgZGlyZWN0aW9uKSkKLQkJ Z290byBlcnIzOwotCisJCWdvdG8gZXJyOwogCXJldHVybiBzZzsKIAotZXJyMzoKK2VycjoKIAlz Z19mcmVlX3RhYmxlKHNnKTsKLWVycjI6CiAJa2ZyZWUoc2cpOwotZXJyMToKLQlyZXR1cm4gRVJS X1BUUigtRU5PTUVNKTsKKwlyZXR1cm4gRVJSX1BUUihyZXQpOwogfQogCiBzdGF0aWMgdm9pZCB1 bm1hcF91ZG1hYnVmKHN0cnVjdCBkbWFfYnVmX2F0dGFjaG1lbnQgKmF0LAotLSAKMi45LjMKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBt YWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx3-rdu2.redhat.com ([66.187.233.73]:57908 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727659AbeIKSlm (ORCPT ); Tue, 11 Sep 2018 14:41:42 -0400 From: Gerd Hoffmann To: dri-devel@lists.freedesktop.org Cc: laurent.pinchart@ideasonboard.com, daniel@ffwll.ch, Gerd Hoffmann , Sumit Semwal , linux-media@vger.kernel.org (open list:DMA BUFFER SHARING FRAMEWORK), linaro-mm-sig@lists.linaro.org (moderated list:DMA BUFFER SHARING FRAMEWORK), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 02/13] udmabuf: improve map_udmabuf error handling Date: Tue, 11 Sep 2018 15:42:05 +0200 Message-Id: <20180911134216.9760-3-kraxel@redhat.com> In-Reply-To: <20180911134216.9760-1-kraxel@redhat.com> References: <20180911134216.9760-1-kraxel@redhat.com> Sender: linux-media-owner@vger.kernel.org List-ID: Reported-by: Laurent Pinchart Signed-off-by: Gerd Hoffmann Reviewed-by: Laurent Pinchart Acked-by: Daniel Vetter --- drivers/dma-buf/udmabuf.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index 155050c741..0d03367c57 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -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, - 0, ubuf->pagecount << PAGE_SHIFT, - GFP_KERNEL) < 0) - goto err2; + return ERR_PTR(-ENOMEM); + ret = sg_alloc_table_from_pages(sg, ubuf->pages, ubuf->pagecount, + 0, ubuf->pagecount << PAGE_SHIFT, + 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, -- 2.9.3