diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2019-02-14 10:19:27 +0300 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2019-02-19 14:53:50 -0500 |
| commit | 7cce8e4efe5e782e130f79f8d55fdad48f2db52d (patch) | |
| tree | 89184b852f548cedf083525bfd046c37d33a23ca /drivers/gpu/drm/msm/msm_drv.c | |
| parent | b6bd458c16ac2a7122fc4bc62bbdc66c9310ded7 (diff) | |
| download | lwn-7cce8e4efe5e782e130f79f8d55fdad48f2db52d.tar.gz lwn-7cce8e4efe5e782e130f79f8d55fdad48f2db52d.zip | |
drm/msm: fix an error code in the ioctl
The copy_to/from_user() functions return the number of bytes remaining
to be copied but we should return -EFAULT to the user.
Fixes: f05c83e77460 ("drm/msm: add uapi to get/set debug name")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_drv.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 5e7b5fa01401..87eae44a1006 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -851,8 +851,9 @@ static int msm_ioctl_gem_info(struct drm_device *dev, void *data, ret = -EINVAL; break; } - ret = copy_from_user(msm_obj->name, - u64_to_user_ptr(args->value), args->len); + if (copy_from_user(msm_obj->name, u64_to_user_ptr(args->value), + args->len)) + ret = -EFAULT; msm_obj->name[args->len] = '\0'; for (i = 0; i < args->len; i++) { if (!isprint(msm_obj->name[i])) { @@ -868,8 +869,9 @@ static int msm_ioctl_gem_info(struct drm_device *dev, void *data, } args->len = strlen(msm_obj->name); if (args->value) { - ret = copy_to_user(u64_to_user_ptr(args->value), - msm_obj->name, args->len); + if (copy_to_user(u64_to_user_ptr(args->value), + msm_obj->name, args->len)) + ret = -EFAULT; } break; } |