From owner-svn-src-all@FreeBSD.ORG  Mon Aug 23 05:33:31 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D794310656A3;
	Mon, 23 Aug 2010 05:33:31 +0000 (UTC)
	(envelope-from brian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C7C0A8FC15;
	Mon, 23 Aug 2010 05:33:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7N5XVgM028295;
	Mon, 23 Aug 2010 05:33:31 GMT (envelope-from brian@svn.freebsd.org)
Received: (from brian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7N5XVxa028293;
	Mon, 23 Aug 2010 05:33:31 GMT (envelope-from brian@svn.freebsd.org)
Message-Id: <201008230533.o7N5XVxa028293@svn.freebsd.org>
From: Brian Somers <brian@FreeBSD.org>
Date: Mon, 23 Aug 2010 05:33:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211684 - head/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Aug 2010 05:33:31 -0000

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.
  
  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);