From 89b2d8bbb41d5ec5413bd240bfb6033899482af5 Mon Sep 17 00:00:00 2001 From: brian Date: Mon, 23 Aug 2010 05:33:31 +0000 Subject: uio_resid isn't updated by VOP_READDIR for nfs filesystems. Use the uio_offset adjustment instead to calculate a correct *len. Without this change, we run off the end of the directory data we're reading and panic horribly for nfs filesystems. MFC after: 1 week --- sys/kern/vfs_default.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index 2d9a908..bf037fe 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -281,10 +281,9 @@ get_next_dirent(struct vnode *vp, struct dirent **dpp, char *dirbuf, if (error) return (error); - *off = uio.uio_offset; - *cpos = dirbuf; - *len = (dirbuflen - uio.uio_resid); + *len = uio.uio_offset - *off; + *off = uio.uio_offset; } dp = (struct dirent *)(*cpos); -- cgit v1.1