From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915: Drop the misleading cast to the wrong user pointer type Date: Fri, 14 Sep 2012 16:24:46 +0300 Message-ID: <87har091pd.fsf@intel.com> References: <1347619560-10971-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id E685BA0FD9 for ; Fri, 14 Sep 2012 06:20:43 -0700 (PDT) In-Reply-To: <1347619560-10971-1-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Chris Wilson , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, 14 Sep 2012, Chris Wilson 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 > > Signed-off-by: Chris Wilson > --- > 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