diff options
| author | Dave Hansen <haveblue@us.ibm.com> | 2005-04-17 00:25:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-17 00:25:49 +0200 |
| commit | 1f08ad02379530e1c970d3d104343b9907b4d1b4 (patch) | |
| tree | 607f1e99cefab35bccb14b5c053c0d63ff74458c /fs/read_write.c | |
| parent | [PATCH] officially deprecate register_ioctl32_conversion (diff) | |
| download | linux-1f08ad02379530e1c970d3d104343b9907b4d1b4.tar.xz linux-1f08ad02379530e1c970d3d104343b9907b4d1b4.zip | |
[PATCH] undo do_readv_writev() behavior change
Bugme bug 4326: http://bugme.osdl.org/show_bug.cgi?id=4326 reports:
executing the systemcall readv with Bad argument
->len == -1) it gives out error EFAULT instead of EINVAL
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/read_write.c')
| -rw-r--r-- | fs/read_write.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/read_write.c b/fs/read_write.c index 6be4b1a1956b..c4c2bee373ed 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -467,10 +467,10 @@ static ssize_t do_readv_writev(int type, struct file *file, void __user *buf = iov[seg].iov_base; ssize_t len = (ssize_t)iov[seg].iov_len; - if (unlikely(!access_ok(vrfy_dir(type), buf, len))) - goto Efault; if (len < 0) /* size_t not fitting an ssize_t .. */ goto out; + if (unlikely(!access_ok(vrfy_dir(type), buf, len))) + goto Efault; tot_len += len; if ((ssize_t)tot_len < 0) /* maths overflow on the ssize_t */ goto out; |