From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Tue, 08 Mar 2016 12:09:41 +0000 Subject: [patch] drm/vc4: Return -EFAULT on copy_from_user() failure Message-Id: <20160308120941.GD28684@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: David Airlie , Eric Anholt Cc: Daniel Vetter , "Luis R. Rodriguez" , kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Andrew Morton The copy_from_user() function returns the number of bytes not copied but we want to return a negative error code. Fixes: 463873d57014 ('drm/vc4: Add an API for creating GPU shaders in GEM BOs.') Signed-off-by: Dan Carpenter diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c index 034ef2d..9807bc9 100644 --- a/drivers/gpu/drm/vc4/vc4_bo.c +++ b/drivers/gpu/drm/vc4/vc4_bo.c @@ -498,11 +498,12 @@ vc4_create_shader_bo_ioctl(struct drm_device *dev, void *data, if (IS_ERR(bo)) return PTR_ERR(bo); - ret = copy_from_user(bo->base.vaddr, + if (copy_from_user(bo->base.vaddr, (void __user *)(uintptr_t)args->data, - args->size); - if (ret != 0) + args->size)) { + ret = -EFAULT; goto fail; + } /* Clear the rest of the memory from allocating from the BO * cache. */ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [patch] drm/vc4: Return -EFAULT on copy_from_user() failure Date: Tue, 8 Mar 2016 15:09:41 +0300 Message-ID: <20160308120941.GD28684@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) by gabe.freedesktop.org (Postfix) with ESMTPS id 21B826E682 for ; Tue, 8 Mar 2016 12:10:02 +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: David Airlie , Eric Anholt Cc: Daniel Vetter , "Luis R. Rodriguez" , kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Andrew Morton List-Id: dri-devel@lists.freedesktop.org VGhlIGNvcHlfZnJvbV91c2VyKCkgZnVuY3Rpb24gcmV0dXJucyB0aGUgbnVtYmVyIG9mIGJ5dGVz IG5vdCBjb3BpZWQgYnV0CndlIHdhbnQgdG8gcmV0dXJuIGEgbmVnYXRpdmUgZXJyb3IgY29kZS4K CkZpeGVzOiA0NjM4NzNkNTcwMTQgKCdkcm0vdmM0OiBBZGQgYW4gQVBJIGZvciBjcmVhdGluZyBH UFUgc2hhZGVycyBpbiBHRU0gQk9zLicpClNpZ25lZC1vZmYtYnk6IERhbiBDYXJwZW50ZXIgPGRh bi5jYXJwZW50ZXJAb3JhY2xlLmNvbT4KCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmM0 L3ZjNF9iby5jIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfYm8uYwppbmRleCAwMzRlZjJkLi45 ODA3YmM5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9iby5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS92YzQvdmM0X2JvLmMKQEAgLTQ5OCwxMSArNDk4LDEyIEBAIHZjNF9jcmVh dGVfc2hhZGVyX2JvX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJ aWYgKElTX0VSUihibykpCiAJCXJldHVybiBQVFJfRVJSKGJvKTsKIAotCXJldCA9IGNvcHlfZnJv bV91c2VyKGJvLT5iYXNlLnZhZGRyLAorCWlmIChjb3B5X2Zyb21fdXNlcihiby0+YmFzZS52YWRk ciwKIAkJCSAgICAgKHZvaWQgX191c2VyICopKHVpbnRwdHJfdClhcmdzLT5kYXRhLAotCQkJICAg ICBhcmdzLT5zaXplKTsKLQlpZiAocmV0ICE9IDApCisJCQkgICAgIGFyZ3MtPnNpemUpKSB7CisJ CXJldCA9IC1FRkFVTFQ7CiAJCWdvdG8gZmFpbDsKKwl9CiAJLyogQ2xlYXIgdGhlIHJlc3Qgb2Yg dGhlIG1lbW9yeSBmcm9tIGFsbG9jYXRpbmcgZnJvbSB0aGUgQk8KIAkgKiBjYWNoZS4KIAkgKi8K X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932414AbcCHMKO (ORCPT ); Tue, 8 Mar 2016 07:10:14 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:33248 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932240AbcCHMKE (ORCPT ); Tue, 8 Mar 2016 07:10:04 -0500 Date: Tue, 8 Mar 2016 15:09:41 +0300 From: Dan Carpenter To: David Airlie , Eric Anholt Cc: "Luis R. Rodriguez" , Daniel Vetter , Andrew Morton , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] drm/vc4: Return -EFAULT on copy_from_user() failure Message-ID: <20160308120941.GD28684@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The copy_from_user() function returns the number of bytes not copied but we want to return a negative error code. Fixes: 463873d57014 ('drm/vc4: Add an API for creating GPU shaders in GEM BOs.') Signed-off-by: Dan Carpenter diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c index 034ef2d..9807bc9 100644 --- a/drivers/gpu/drm/vc4/vc4_bo.c +++ b/drivers/gpu/drm/vc4/vc4_bo.c @@ -498,11 +498,12 @@ vc4_create_shader_bo_ioctl(struct drm_device *dev, void *data, if (IS_ERR(bo)) return PTR_ERR(bo); - ret = copy_from_user(bo->base.vaddr, + if (copy_from_user(bo->base.vaddr, (void __user *)(uintptr_t)args->data, - args->size); - if (ret != 0) + args->size)) { + ret = -EFAULT; goto fail; + } /* Clear the rest of the memory from allocating from the BO * cache. */