From 68fa9634fe02df8ca54f505886a20f29f5bac4c2 Mon Sep 17 00:00:00 2001 From: Rebecca Schultz Zavin Date: Thu, 28 Feb 2013 16:43:13 -0800 Subject: [PATCH] --- yaml --- r: 363273 b: refs/heads/master c: 03e7a503561f6d0ef09c7ec73772a7a6f78417d3 h: refs/heads/master i: 363271: 60e7405887a1f42330bc933c05efed1218634b35 v: v3 --- [refs] | 2 +- trunk/drivers/staging/android/sw_sync.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 47dbbf5186a2..26f040cc38be 100644 --- 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 index d689760678c3..d76889357e6c 100644 --- 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) {