staging: sync: Fix error paths

[karo-tx-linux.git] / drivers / staging / android / sync.c

diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index 61c27bdc5d0bafe19f2bd47592fe3cc78c8c12c7..c4a3c1d7946c712dda286b301816b741ba9d1788 100644 (file)
--- a/drivers/staging/android/sync.c
+++ b/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) {