diff options
| author | Gareth Hughes <gareth@users.sourceforge.net> | 2000-09-06 20:56:34 +0000 |
|---|---|---|
| committer | Gareth Hughes <gareth@users.sourceforge.net> | 2000-09-06 20:56:34 +0000 |
| commit | 7db6449142ca24183f50e6f9dcf396b899b4113b (patch) | |
| tree | 351a460b510edd1b4236323e98d41892e843593c /linux/lock.c | |
| parent | e3e2d66131a3615379fe81ea106d7133da084683 (diff) | |
Sync with 2.4.0-test8-pre5 kernel.
Diffstat (limited to 'linux/lock.c')
| -rw-r--r-- | linux/lock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/lock.c b/linux/lock.c index 33b2cc03..e5fd435f 100644 --- a/linux/lock.c +++ b/linux/lock.c @@ -218,7 +218,8 @@ int drm_finish(struct inode *inode, struct file *filp, unsigned int cmd, DRM_DEBUG("\n"); - copy_from_user_ret(&lock, (drm_lock_t *)arg, sizeof(lock), -EFAULT); + if (copy_from_user(&lock, (drm_lock_t *)arg, sizeof(lock))) + return -EFAULT; ret = drm_flush_block_and_flush(dev, lock.context, lock.flags); drm_flush_unblock(dev, lock.context, lock.flags); return ret; |