From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Fri, 14 Sep 2018 06:56:15 +0000 Subject: [PATCH] udmabuf: fix error code in map_udmabuf() Message-Id: <20180914065615.GA12043@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Gerd Hoffmann Cc: linaro-mm-sig@lists.linaro.org, kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org We accidentally forgot to set "ret" on this error path so it means we return NULL instead of an error pointer. The caller checks for NULL and changes it to an error pointer so it doesn't cause an issue at run time. Signed-off-by: Dan Carpenter diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index 9edabce0b8ab..5b44ef226904 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -61,8 +61,10 @@ static struct sg_table *map_udmabuf(struct dma_buf_attachment *at, GFP_KERNEL); if (ret < 0) goto err; - if (!dma_map_sg(at->dev, sg->sgl, sg->nents, direction)) + if (!dma_map_sg(at->dev, sg->sgl, sg->nents, direction)) { + ret = -EINVAL; goto err; + } return sg; err: From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [PATCH] udmabuf: fix error code in map_udmabuf() Date: Fri, 14 Sep 2018 09:56:15 +0300 Message-ID: <20180914065615.GA12043@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from aserp2120.oracle.com (aserp2120.oracle.com [141.146.126.78]) by gabe.freedesktop.org (Postfix) with ESMTPS id A40266E008 for ; Fri, 14 Sep 2018 06:56:33 +0000 (UTC) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Gerd Hoffmann Cc: linaro-mm-sig@lists.linaro.org, kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org V2UgYWNjaWRlbnRhbGx5IGZvcmdvdCB0byBzZXQgInJldCIgb24gdGhpcyBlcnJvciBwYXRoIHNv IGl0IG1lYW5zIHdlCnJldHVybiBOVUxMIGluc3RlYWQgb2YgYW4gZXJyb3IgcG9pbnRlci4gIFRo ZSBjYWxsZXIgY2hlY2tzIGZvciBOVUxMIGFuZApjaGFuZ2VzIGl0IHRvIGFuIGVycm9yIHBvaW50 ZXIgc28gaXQgZG9lc24ndCBjYXVzZSBhbiBpc3N1ZSBhdCBydW4gdGltZS4KClNpZ25lZC1vZmYt Ynk6IERhbiBDYXJwZW50ZXIgPGRhbi5jYXJwZW50ZXJAb3JhY2xlLmNvbT4KCmRpZmYgLS1naXQg YS9kcml2ZXJzL2RtYS1idWYvdWRtYWJ1Zi5jIGIvZHJpdmVycy9kbWEtYnVmL3VkbWFidWYuYwpp bmRleCA5ZWRhYmNlMGI4YWIuLjViNDRlZjIyNjkwNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9kbWEt YnVmL3VkbWFidWYuYworKysgYi9kcml2ZXJzL2RtYS1idWYvdWRtYWJ1Zi5jCkBAIC02MSw4ICs2 MSwxMCBAQCBzdGF0aWMgc3RydWN0IHNnX3RhYmxlICptYXBfdWRtYWJ1ZihzdHJ1Y3QgZG1hX2J1 Zl9hdHRhY2htZW50ICphdCwKIAkJCQkJR0ZQX0tFUk5FTCk7CiAJaWYgKHJldCA8IDApCiAJCWdv dG8gZXJyOwotCWlmICghZG1hX21hcF9zZyhhdC0+ZGV2LCBzZy0+c2dsLCBzZy0+bmVudHMsIGRp cmVjdGlvbikpCisJaWYgKCFkbWFfbWFwX3NnKGF0LT5kZXYsIHNnLT5zZ2wsIHNnLT5uZW50cywg ZGlyZWN0aW9uKSkgeworCQlyZXQgPSAtRUlOVkFMOwogCQlnb3RvIGVycjsKKwl9CiAJcmV0dXJu IHNnOwogCiBlcnI6Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZl bAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from aserp2120.oracle.com ([141.146.126.78]:56350 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726831AbeINMJm (ORCPT ); Fri, 14 Sep 2018 08:09:42 -0400 Date: Fri, 14 Sep 2018 09:56:15 +0300 From: Dan Carpenter To: Gerd Hoffmann Cc: Sumit Semwal , dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, kernel-janitors@vger.kernel.org Subject: [PATCH] udmabuf: fix error code in map_udmabuf() Message-ID: <20180914065615.GA12043@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: linux-media-owner@vger.kernel.org List-ID: We accidentally forgot to set "ret" on this error path so it means we return NULL instead of an error pointer. The caller checks for NULL and changes it to an error pointer so it doesn't cause an issue at run time. Signed-off-by: Dan Carpenter diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index 9edabce0b8ab..5b44ef226904 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -61,8 +61,10 @@ static struct sg_table *map_udmabuf(struct dma_buf_attachment *at, GFP_KERNEL); if (ret < 0) goto err; - if (!dma_map_sg(at->dev, sg->sgl, sg->nents, direction)) + if (!dma_map_sg(at->dev, sg->sgl, sg->nents, direction)) { + ret = -EINVAL; goto err; + } return sg; err: