From: Dave Airlie <airlied@redhat.com>
Date: Sun, 29 Mar 2009 00:29:48 +0000 (-0400)
Subject: drm/i915: check the return value from the copy from user
X-Git-Tag: v2.6.30-rc1~613^2~7
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=d008877550d8ca8c6878dd494e50c1b9209f38d4;p=safe%2Fjmp%2Flinux-2.6

drm/i915: check the return value from the copy from user

This produced a warning on my build, not sure why super-warning-man didn't
notice this one, its much worse than the %z one.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index e5d2bdf..e0389ad 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -446,13 +446,16 @@ fast_shmem_write(struct page **pages,
 		 int length)
 {
 	char __iomem *vaddr;
+	unsigned long unwritten;
 
 	vaddr = kmap_atomic(pages[page_base >> PAGE_SHIFT], KM_USER0);
 	if (vaddr == NULL)
 		return -ENOMEM;
-	__copy_from_user_inatomic(vaddr + page_offset, data, length);
+	unwritten = __copy_from_user_inatomic(vaddr + page_offset, data, length);
 	kunmap_atomic(vaddr, KM_USER0);
 
+	if (unwritten)
+		return -EFAULT;
 	return 0;
 }