Commit 92ea915a authored Feb 28, 2013 by Rebecca Schultz Zavin Committed by Greg Kroah-Hartman Mar 04, 2013

staging: sync: Fix error paths



Check the return value of get_unused_fd to make sure a valid
file descriptor is returned.

Make sure to call put_unused_fd even if an error occurs before
the fd can be used.

Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Cc: Erik Gilling <konkers@android.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Rob Clark <robclark@gmail.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: dri-devel@lists.freedesktop.org
Cc: Android Kernel Team <kernel-team@android.com>
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent c5b86b74

drivers/staging/android/sync.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -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) {