Skip to content

Commit

Permalink
staging: sw_sync: Fix error paths
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rebecca Schultz Zavin authored and Greg Kroah-Hartman committed Mar 4, 2013
1 parent 92ea915 commit 03e7a50
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions drivers/staging/android/sw_sync.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 03e7a50

Please sign in to comment.