diff options
author | pfg <pfg@FreeBSD.org> | 2013-07-25 19:37:49 +0000 |
---|---|---|
committer | pfg <pfg@FreeBSD.org> | 2013-07-25 19:37:49 +0000 |
commit | d1aa5826fa2ff69ce857b49c504480a4a0c39f3c (patch) | |
tree | 93f25af3aea855a5f7481b3d685862fab52155ca /sys/fs/ext2fs | |
parent | 2ee9cbbc0f2eac16f7992f499b44214817eade29 (diff) | |
download | FreeBSD-src-d1aa5826fa2ff69ce857b49c504480a4a0c39f3c.zip FreeBSD-src-d1aa5826fa2ff69ce857b49c504480a4a0c39f3c.tar.gz |
ext2fs: Return EINVAL for negative uio_offset as in UFS.
While here drop old comment that doesn't really apply.
MFC after: 1 month
Discussed with: gleb
Diffstat (limited to 'sys/fs/ext2fs')
-rw-r--r-- | sys/fs/ext2fs/ext2_lookup.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/fs/ext2fs/ext2_lookup.c b/sys/fs/ext2fs/ext2_lookup.c index 71f1fbe..990ed33 100644 --- a/sys/fs/ext2fs/ext2_lookup.c +++ b/sys/fs/ext2fs/ext2_lookup.c @@ -146,6 +146,8 @@ ext2_readdir(struct vop_readdir_args *ap) int DIRBLKSIZ = VTOI(ap->a_vp)->i_e2fs->e2fs_bsize; int error; + if (uio->uio_offset < 0) + return (EINVAL); ip = VTOI(vp); if (ap->a_ncookies != NULL) { ncookies = uio->uio_resid; @@ -162,14 +164,6 @@ ext2_readdir(struct vop_readdir_args *ap) ncookies = 0; cookies = NULL; } - /* - * Avoid complications for partial directory entries by adjusting - * the i/o to end at a block boundary. Don't give up (like ufs - * does) if the initial adjustment gives a negative count, since - * many callers don't supply a large enough buffer. The correct - * size is a little larger than DIRBLKSIZ to allow for expansion - * of directory entries, but some callers just use 512. - */ offset = startoffset = uio->uio_offset; startresid = uio->uio_resid; error = 0; |