[PATCH 1/1] DRM: i915, fix pointer strip

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Jiri Slaby
Date: Tuesday, November 13, 2007 - 6:15 am

i915, fix pointer strip

Beside the emitted warning, the added cast (u64 -> unsigned) strips out
part of address on 64 bit. Cast to unsigned long instead.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Thomas Hellstrom <thomas@tungstengraphics.com>
Cc: Dave Airlie <airlied@linux.ie>

---
commit 496b198ff1b261c902337f93f07e7eabebd15fcd
tree 82e09385c7079b58397c547d4213f8a7f066191e
parent 32df077a4a9ff106df31681999e869971eacb470
author Jiri Slaby <jirislaby@gmail.com> Tue, 13 Nov 2007 14:12:08 +0100
committer Jiri Slaby <jirislaby@gmail.com> Tue, 13 Nov 2007 14:12:08 +0100

 drivers/char/drm/i915_dma.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index eced445..a68e0ee 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -900,7 +900,7 @@ int i915_validate_buffer_list(struct drm_file *file_priv,
 
 		buffers[buf_count] = NULL;
 
-		if (copy_from_user(&arg, (void __user *)(unsigned)data, sizeof(arg))) {
+		if (copy_from_user(&arg, (void __user *)(unsigned long)data, sizeof(arg))) {
 			ret = -EFAULT;
 			goto out_err;
 		}
@@ -951,7 +951,7 @@ int i915_validate_buffer_list(struct drm_file *file_priv,
 		arg.handled = 1;
 		arg.d.rep = rep;
 
-		if (copy_to_user((void __user *)(unsigned)data, &arg, sizeof(arg)))
+		if (copy_to_user((void __user *)(unsigned long)data, &arg, sizeof(arg)))
 			return -EFAULT;
 
 		data = next;
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 1/1] DRM: i915, fix pointer strip, Jiri Slaby, (Tue Nov 13, 6:15 am)