summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_ioc32.c
diff options
context:
space:
mode:
authorDan Carpenter2019-06-18 15:18:43 +0200
committerGreg Kroah-Hartman2019-07-14 08:11:14 +0200
commita02ac12d2d4844de77f876e96b93ec3f2226af6a (patch)
tree0ef66dbaae7df3a83c7a08612234e1ad03f9613c /drivers/gpu/drm/drm_ioc32.c
parentbnx2x: Check if transceiver implements DDM before access (diff)
downloadkernel-qcow2-linux-a02ac12d2d4844de77f876e96b93ec3f2226af6a.tar.gz
kernel-qcow2-linux-a02ac12d2d4844de77f876e96b93ec3f2226af6a.tar.xz
kernel-qcow2-linux-a02ac12d2d4844de77f876e96b93ec3f2226af6a.zip
drm: return -EFAULT if copy_to_user() fails
[ Upstream commit 74b67efa8d7b4f90137f0ab9a80dd319da050350 ] The copy_from_user() function returns the number of bytes remaining to be copied but we want to return a negative error code. Otherwise the callers treat it as a successful copy. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Sean Paul <seanpaul@chromium.org> Link: https://patchwork.freedesktop.org/patch/msgid/20190618131843.GA29463@mwanda Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/drm_ioc32.c')
-rw-r--r--drivers/gpu/drm/drm_ioc32.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
index 67b1fca39aa6..138680b37c70 100644
--- a/drivers/gpu/drm/drm_ioc32.c
+++ b/drivers/gpu/drm/drm_ioc32.c
@@ -372,7 +372,10 @@ static int copy_one_buf32(void *data, int count, struct drm_buf_entry *from)
.size = from->buf_size,
.low_mark = from->low_mark,
.high_mark = from->high_mark};
- return copy_to_user(to + count, &v, offsetof(drm_buf_desc32_t, flags));
+
+ if (copy_to_user(to + count, &v, offsetof(drm_buf_desc32_t, flags)))
+ return -EFAULT;
+ return 0;
}
static int drm_legacy_infobufs32(struct drm_device *dev, void *data,