---

yaml --- r: 363272 b: refs/heads/master c: 92ea915 h: refs/heads/master v: v3
git-mirror · Mar 4, 2013 · b05240e · b05240e
1 parent 60e7405
commit b05240e
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: c5b86b7418f46220a623277718d6a909f520477b
+refs/heads/master: 92ea915adb5565b522902a7b3f0a33ede16bb797
diff --git a/trunk/drivers/staging/android/sync.c b/trunk/drivers/staging/android/sync.c
@@ -647,8 +647,13 @@ static long sync_fence_ioctl_merge(struct sync_fence *fence, unsigned long arg)
 	struct sync_fence *fence2, *fence3;
 	struct sync_merge_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_put_fd;
+	}
 
 	fence2 = sync_fence_fdget(data.fd2);
 	if (fence2 == NULL) {