---

yaml --- r: 363273 b: refs/heads/master c: 03e7a50 h: refs/heads/master i: 363271: 60e7405 v: v3
git-mirror · Mar 4, 2013 · 68fa963 · 68fa963
1 parent b05240e
commit 68fa963
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92ea915adb5565b522902a7b3f0a33ede16bb797
+refs/heads/master: 03e7a503561f6d0ef09c7ec73772a7a6f78417d3
diff --git a/trunk/drivers/staging/android/sw_sync.c b/trunk/drivers/staging/android/sw_sync.c
@@ -170,8 +170,13 @@ long sw_sync_ioctl_create_fence(struct sw_sync_timeline *obj, unsigned long arg)
 	struct sync_fence *fence;
 	struct sw_sync_create_fence_data data;
 
-	if (copy_from_user(&data, (void __user *)arg, sizeof(data)))
-		return -EFAULT;
+	if (fd < 0)
+		return fd;
+
+	if (copy_from_user(&data, (void __user *)arg, sizeof(data))) {
+		err = -EFAULT;
+		goto err;
+	}
 
 	pt = sw_sync_pt_create(obj, data.value);
 	if (pt == NULL) {