From: Jani Nikula <jani.nikula@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Drop the misleading cast to the wrong user pointer type
Date: Fri, 14 Sep 2012 16:24:46 +0300 [thread overview]
Message-ID: <87har091pd.fsf@intel.com> (raw)
In-Reply-To: <1347619560-10971-1-git-send-email-chris@chris-wilson.co.uk>
On Fri, 14 Sep 2012, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> The exec_list is of type drm_i915_gem_exec_object2 and so casting it to
> a drm_i915_gem_relocation_entry is very confusing!
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> drivers/gpu/drm/i915/i915_gem_execbuffer.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> index 4ab0083..8186f63 100644
> --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> @@ -1102,8 +1102,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
> return -ENOMEM;
> }
> ret = copy_from_user(exec_list,
> - (struct drm_i915_relocation_entry __user *)
> - (uintptr_t) args->buffers_ptr,
> + (void __user *)(uintptr_t)args->buffers_ptr,
> sizeof(*exec_list) * args->buffer_count);
> if (ret != 0) {
> DRM_DEBUG("copy %d exec entries failed %d\n",
> @@ -1142,8 +1141,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
> for (i = 0; i < args->buffer_count; i++)
> exec_list[i].offset = exec2_list[i].offset;
> /* ... and back out to userspace */
> - ret = copy_to_user((struct drm_i915_relocation_entry __user *)
> - (uintptr_t) args->buffers_ptr,
> + ret = copy_to_user((void __user *)(uintptr_t)args->buffers_ptr,
> exec_list,
> sizeof(*exec_list) * args->buffer_count);
> if (ret) {
> @@ -1197,8 +1195,7 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data,
> ret = i915_gem_do_execbuffer(dev, data, file, args, exec2_list);
> if (!ret) {
> /* Copy the new buffer offsets back to the user's exec list. */
> - ret = copy_to_user((struct drm_i915_relocation_entry __user *)
> - (uintptr_t) args->buffers_ptr,
> + ret = copy_to_user((void __user *)(uintptr_t)args->buffers_ptr,
> exec2_list,
> sizeof(*exec2_list) * args->buffer_count);
> if (ret) {
> --
> 1.7.10.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2012-09-14 13:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-14 10:46 [PATCH] drm/i915: Drop the misleading cast to the wrong user pointer type Chris Wilson
2012-09-14 13:24 ` Jani Nikula [this message]
2012-09-14 16:31 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87har091pd.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.