From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Wed, 13 Jul 2016 10:35:29 +0000 Subject: [patch] drm/msm: return -EFAULT instead of bytes remaining Message-Id: <20160713103529.GL29468@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Rob Clark Cc: linux-arm-msm@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org copy_to/from_user returns the number of bytes remaining to be copied but we want to return -EFAULT. Signed-off-by: Dan Carpenter diff --git a/drivers/gpu/drm/msm/msm_perf.c b/drivers/gpu/drm/msm/msm_perf.c index 830857c..17fe4e5 100644 --- a/drivers/gpu/drm/msm/msm_perf.c +++ b/drivers/gpu/drm/msm/msm_perf.c @@ -132,7 +132,7 @@ static ssize_t perf_read(struct file *file, char __user *buf, size_t sz, loff_t *ppos) { struct msm_perf_state *perf = file->private_data; - int n = 0, ret; + int n = 0, ret = 0; mutex_lock(&perf->read_lock); @@ -143,9 +143,10 @@ static ssize_t perf_read(struct file *file, char __user *buf, } n = min((int)sz, perf->buftot - perf->bufpos); - ret = copy_to_user(buf, &perf->buf[perf->bufpos], n); - if (ret) + if (copy_to_user(buf, &perf->buf[perf->bufpos], n)) { + ret = -EFAULT; goto out; + } perf->bufpos += n; *ppos += n; diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c index 24254e0..3a5fdfc 100644 --- a/drivers/gpu/drm/msm/msm_rd.c +++ b/drivers/gpu/drm/msm/msm_rd.c @@ -149,9 +149,10 @@ static ssize_t rd_read(struct file *file, char __user *buf, goto out; n = min_t(int, sz, circ_count_to_end(&rd->fifo)); - ret = copy_to_user(buf, fptr, n); - if (ret) + if (copy_to_user(buf, fptr, n)) { + ret = -EFAULT; goto out; + } fifo->tail = (fifo->tail + n) & (BUF_SZ - 1); *ppos += n; From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [patch] drm/msm: return -EFAULT instead of bytes remaining Date: Wed, 13 Jul 2016 13:35:29 +0300 Message-ID: <20160713103529.GL29468@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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: Rob Clark Cc: linux-arm-msm@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org List-Id: linux-arm-msm@vger.kernel.org Y29weV90by9mcm9tX3VzZXIgcmV0dXJucyB0aGUgbnVtYmVyIG9mIGJ5dGVzIHJlbWFpbmluZyB0 byBiZSBjb3BpZWQgYnV0CndlIHdhbnQgdG8gcmV0dXJuIC1FRkFVTFQuCgpTaWduZWQtb2ZmLWJ5 OiBEYW4gQ2FycGVudGVyIDxkYW4uY2FycGVudGVyQG9yYWNsZS5jb20+CgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL21zbS9tc21fcGVyZi5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9tc21f cGVyZi5jCmluZGV4IDgzMDg1N2MuLjE3ZmU0ZTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9tc20vbXNtX3BlcmYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9wZXJmLmMKQEAg LTEzMiw3ICsxMzIsNyBAQCBzdGF0aWMgc3NpemVfdCBwZXJmX3JlYWQoc3RydWN0IGZpbGUgKmZp bGUsIGNoYXIgX191c2VyICpidWYsCiAJCXNpemVfdCBzeiwgbG9mZl90ICpwcG9zKQogewogCXN0 cnVjdCBtc21fcGVyZl9zdGF0ZSAqcGVyZiA9IGZpbGUtPnByaXZhdGVfZGF0YTsKLQlpbnQgbiA9 IDAsIHJldDsKKwlpbnQgbiA9IDAsIHJldCA9IDA7CiAKIAltdXRleF9sb2NrKCZwZXJmLT5yZWFk X2xvY2spOwogCkBAIC0xNDMsOSArMTQzLDEwIEBAIHN0YXRpYyBzc2l6ZV90IHBlcmZfcmVhZChz dHJ1Y3QgZmlsZSAqZmlsZSwgY2hhciBfX3VzZXIgKmJ1ZiwKIAl9CiAKIAluID0gbWluKChpbnQp c3osIHBlcmYtPmJ1ZnRvdCAtIHBlcmYtPmJ1ZnBvcyk7Ci0JcmV0ID0gY29weV90b191c2VyKGJ1 ZiwgJnBlcmYtPmJ1ZltwZXJmLT5idWZwb3NdLCBuKTsKLQlpZiAocmV0KQorCWlmIChjb3B5X3Rv X3VzZXIoYnVmLCAmcGVyZi0+YnVmW3BlcmYtPmJ1ZnBvc10sIG4pKSB7CisJCXJldCA9IC1FRkFV TFQ7CiAJCWdvdG8gb3V0OworCX0KIAogCXBlcmYtPmJ1ZnBvcyArPSBuOwogCSpwcG9zICs9IG47 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9yZC5jIGIvZHJpdmVycy9ncHUv ZHJtL21zbS9tc21fcmQuYwppbmRleCAyNDI1NGUwLi4zYTVmZGZjIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vbXNtL21zbV9yZC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX3Jk LmMKQEAgLTE0OSw5ICsxNDksMTAgQEAgc3RhdGljIHNzaXplX3QgcmRfcmVhZChzdHJ1Y3QgZmls ZSAqZmlsZSwgY2hhciBfX3VzZXIgKmJ1ZiwKIAkJZ290byBvdXQ7CiAKIAluID0gbWluX3QoaW50 LCBzeiwgY2lyY19jb3VudF90b19lbmQoJnJkLT5maWZvKSk7Ci0JcmV0ID0gY29weV90b191c2Vy KGJ1ZiwgZnB0ciwgbik7Ci0JaWYgKHJldCkKKwlpZiAoY29weV90b191c2VyKGJ1ZiwgZnB0ciwg bikpIHsKKwkJcmV0ID0gLUVGQVVMVDsKIAkJZ290byBvdXQ7CisJfQogCiAJZmlmby0+dGFpbCA9 IChmaWZvLT50YWlsICsgbikgJiAoQlVGX1NaIC0gMSk7CiAJKnBwb3MgKz0gbjsKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcg bGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753179AbcGMKf4 (ORCPT ); Wed, 13 Jul 2016 06:35:56 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:19802 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751112AbcGMKfq (ORCPT ); Wed, 13 Jul 2016 06:35:46 -0400 Date: Wed, 13 Jul 2016 13:35:29 +0300 From: Dan Carpenter To: Rob Clark Cc: David Airlie , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] drm/msm: return -EFAULT instead of bytes remaining Message-ID: <20160713103529.GL29468@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.6.0 (2016-04-01) X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org copy_to/from_user returns the number of bytes remaining to be copied but we want to return -EFAULT. Signed-off-by: Dan Carpenter diff --git a/drivers/gpu/drm/msm/msm_perf.c b/drivers/gpu/drm/msm/msm_perf.c index 830857c..17fe4e5 100644 --- a/drivers/gpu/drm/msm/msm_perf.c +++ b/drivers/gpu/drm/msm/msm_perf.c @@ -132,7 +132,7 @@ static ssize_t perf_read(struct file *file, char __user *buf, size_t sz, loff_t *ppos) { struct msm_perf_state *perf = file->private_data; - int n = 0, ret; + int n = 0, ret = 0; mutex_lock(&perf->read_lock); @@ -143,9 +143,10 @@ static ssize_t perf_read(struct file *file, char __user *buf, } n = min((int)sz, perf->buftot - perf->bufpos); - ret = copy_to_user(buf, &perf->buf[perf->bufpos], n); - if (ret) + if (copy_to_user(buf, &perf->buf[perf->bufpos], n)) { + ret = -EFAULT; goto out; + } perf->bufpos += n; *ppos += n; diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c index 24254e0..3a5fdfc 100644 --- a/drivers/gpu/drm/msm/msm_rd.c +++ b/drivers/gpu/drm/msm/msm_rd.c @@ -149,9 +149,10 @@ static ssize_t rd_read(struct file *file, char __user *buf, goto out; n = min_t(int, sz, circ_count_to_end(&rd->fifo)); - ret = copy_to_user(buf, fptr, n); - if (ret) + if (copy_to_user(buf, fptr, n)) { + ret = -EFAULT; goto out; + } fifo->tail = (fifo->tail + n) & (BUF_SZ - 1); *ppos += n;