summaryrefslogtreecommitdiffstats
path: root/fs/read_write.c
diff options
context:
space:
mode:
authorDave Hansen <haveblue@us.ibm.com>2005-04-16 15:25:49 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 15:25:49 -0700
commit1f08ad02379530e1c970d3d104343b9907b4d1b4 (patch)
tree607f1e99cefab35bccb14b5c053c0d63ff74458c /fs/read_write.c
parent22a685d09bb98810670ac0fb02c2138bdbf038cc (diff)
downloadop-kernel-dev-1f08ad02379530e1c970d3d104343b9907b4d1b4.zip
op-kernel-dev-1f08ad02379530e1c970d3d104343b9907b4d1b4.tar.gz
[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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/read_write.c b/fs/read_write.c
index 6be4b1a..c4c2bee 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;
OpenPOWER on IntegriCloud