Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a991600 authored by Dan Carpenter's avatar Dan Carpenter Committed by Thierry Reding
Browse files

drm/tegra: return -EFAULT if copy_from_user() fails 



copy_from_user() returns the number of bytes remaining if it fails, but
we want to return -EFAULT here.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent d24b2898

drivers/gpu/drm/tegra/drm.c

+15 −11
Original line number Diff line number Diff line
@@ -163,9 +163,10 @@ int tegra_drm_submit(struct tegra_drm_context *context, 
		struct drm_tegra_cmdbuf cmdbuf;

		struct host1x_bo *bo;



		err = copy_from_user(&cmdbuf, cmdbufs, sizeof(cmdbuf));

		if (err)

		if (copy_from_user(&cmdbuf, cmdbufs, sizeof(cmdbuf))) {

			err = -EFAULT;

			goto fail;

		}



		bo = host1x_bo_lookup(drm, file, cmdbuf.handle);

		if (!bo) {
@@ -178,10 +179,11 @@ int tegra_drm_submit(struct tegra_drm_context *context, 
		cmdbufs++;

	}



	err = copy_from_user(job->relocarray, relocs,

			     sizeof(*relocs) * num_relocs);

	if (err)

	if (copy_from_user(job->relocarray, relocs,

			   sizeof(*relocs) * num_relocs)) {

		err = -EFAULT;

		goto fail;

	}



	while (num_relocs--) {

		struct host1x_reloc *reloc = &job->relocarray[num_relocs];
@@ -199,15 +201,17 @@ int tegra_drm_submit(struct tegra_drm_context *context, 
		}

	}



	err = copy_from_user(job->waitchk, waitchks,

			     sizeof(*waitchks) * num_waitchks);

	if (err)

	if (copy_from_user(job->waitchk, waitchks,

			   sizeof(*waitchks) * num_waitchks)) {

		err = -EFAULT;

		goto fail;

	}



	err = copy_from_user(&syncpt, (void __user *)(uintptr_t)args->syncpts,

			     sizeof(syncpt));

	if (err)

	if (copy_from_user(&syncpt, (void __user *)(uintptr_t)args->syncpts,

			   sizeof(syncpt))) {

		err = -EFAULT;

		goto fail;

	}



	job->is_addr_reg = context->client->ops->is_addr_reg;

	job->syncpt_incrs = syncpt.incrs;