aboutsummaryrefslogtreecommitdiff
path: root/sys/fs
diff options
context:
space:
mode:
authorKonstantin Belousov <kib@FreeBSD.org>2013-11-20 19:41:00 +0000
committerKonstantin Belousov <kib@FreeBSD.org>2013-11-20 19:41:00 +0000
commit587430f25461572e03decd40bd862f69f360cc10 (patch)
treeac28ed25b5c3f8177eea0318478f31d4c8e1a1e8 /sys/fs
parentc9b53336b88ca5669b535cf3432813edb3d08642 (diff)
Notes
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/pseudofs/pseudofs_vnops.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c
index b6021b1b94063..f00b4b2ad5e49 100644
--- a/sys/fs/pseudofs/pseudofs_vnops.c
+++ b/sys/fs/pseudofs/pseudofs_vnops.c
@@ -616,8 +616,7 @@ pfs_read(struct vop_read_args *va)
struct proc *proc;
struct sbuf *sb = NULL;
int error, locked;
- off_t offset;
- ssize_t buflen, resid;
+ off_t buflen;
PFS_TRACE(("%s", pn->pn_name));
pfs_assert_not_owned(pn);
@@ -654,16 +653,12 @@ pfs_read(struct vop_read_args *va)
goto ret;
}
- resid = uio->uio_resid;
- offset = uio->uio_offset;
- buflen = offset + resid;
-
- /* beaucoup sanity checks so we don't ask for bogus allocation */
- if (resid < 0 || buflen < offset || buflen < resid ||
- buflen >= INT_MAX) {
+ if (uio->uio_resid < 0 || uio->uio_offset < 0 ||
+ uio->uio_resid > OFF_MAX - uio->uio_offset) {
error = EINVAL;
goto ret;
}
+ buflen = uio->uio_offset + uio->uio_resid;
if (buflen > MAXPHYS)
buflen = MAXPHYS;