svn commit: r211684 - head/sys/kern

[Kostik Belousov]

On Mon, Aug 23, 2010 at 05:33:31AM +0000, Brian Somers wrote:
> Author: brian
> Date: Mon Aug 23 05:33:31 2010
> New Revision: 211684
> URL: http://svn.freebsd.org/changeset/base/211684
> 
> Log:
>   uio_resid isn't updated by VOP_READDIR for nfs filesystems.  Use
>   the uio_offset adjustment instead to calculate a correct *len.
Isn't this should be fixed in nfs instead ? Please note that the moral
equivalent of the code is also present in compat/linux/linux_cwd.c:
linux_getcwd_scandir(). I did not inspected other callers of
VOP_READDIR.

>   
>   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
> 
> Modified:
>   head/sys/kern/vfs_default.c
> 
> Modified: head/sys/kern/vfs_default.c
> ==============================================================================
> --- head/sys/kern/vfs_default.c	Mon Aug 23 05:33:20 2010	(r211683)
> +++ head/sys/kern/vfs_default.c	Mon Aug 23 05:33:31 2010	(r211684)
> @@ -281,10 +281,9 @@ get_next_dirent(struct vnode *vp, struct
>  		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);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/svn-src-all/attachments/20100823/1fddaa4b/attachment.pgp