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/fops.c | |
parent | e3e2d66131a3615379fe81ea106d7133da084683 (diff) |
Sync with 2.4.0-test8-pre5 kernel.
Diffstat (limited to 'linux/fops.c')
-rw-r--r-- | linux/fops.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/fops.c b/linux/fops.c index f3966d96..8e373e5a 100644 --- a/linux/fops.c +++ b/linux/fops.c @@ -176,7 +176,8 @@ ssize_t drm_read(struct file *filp, char *buf, size_t count, loff_t *off) } else { cur = DRM_MIN(send, dev->buf_end - dev->buf_rp); } - copy_to_user_ret(buf, dev->buf_rp, cur, -EINVAL); + if (copy_to_user(buf, dev->buf_rp, cur)) + return -EFAULT; dev->buf_rp += cur; if (dev->buf_rp == dev->buf_end) dev->buf_rp = dev->buf; send -= cur; |