diff mbox

drm/i915: Fix a bogus cast in execbuffer2

Message ID 1361540542-16515-1-git-send-email-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ville Syrjälä Feb. 22, 2013, 1:42 p.m. UTC 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

The pointer passed to copy_from_user() was cast to the wrong type. This
doesn't cause any issues, but it confuses the reader. Just cast to
void * like we do for the other execbuffer kernel<->user copies.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Chris Wilson Feb. 22, 2013, 1:47 p.m. UTC | #1 
On Fri, Feb 22, 2013 at 03:42:22PM +0200, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> The pointer passed to copy_from_user() was cast to the wrong type. This
> doesn't cause any issues, but it confuses the reader. Just cast to
> void * like we do for the other execbuffer kernel<->user copies.

  static inline void __user *to_user_ptr(u64 address)
  {
	return (void __user *)(uintptr_t)address;
  }

That should tidy up this repeated idiom.
-Chris
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 2f2daeb..9efe04f 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1190,8 +1190,7 @@  i915_gem_execbuffer2(struct drm_device *dev, void *data,
 		return -ENOMEM;
 	}
 	ret = copy_from_user(exec2_list,
-			     (struct drm_i915_relocation_entry __user *)
-			     (uintptr_t) args->buffers_ptr,
+			     (void __user *)(uintptr_t)args->buffers_ptr,
 			     sizeof(*exec2_list) * args->buffer_count);
 	if (ret != 0) {
 		DRM_DEBUG("copy %d exec entries failed %d\n",